From 225cbfd411d3082eb59052653af1628db10f810f Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 9 Aug 2025 15:57:30 +0800
Subject: [PATCH 1/2] jami: use md4c, html-tidy, hunspell and zxing-cpp from
 nixpkgs

---
 .../networking/instant-messengers/jami/default.nix     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/applications/networking/instant-messengers/jami/default.nix
index 9dbc67d77a4f..26ca498f87ba 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/applications/networking/instant-messengers/jami/default.nix
@@ -45,6 +45,9 @@
   qttools, # for translations
   wrapQtAppsHook,
   libnotify,
+  md4c,
+  html-tidy,
+  hunspell,
   qt5compat,
   qtbase,
   qtdeclarative,
@@ -56,6 +59,7 @@
   qtwebengine,
   qtwebchannel,
   wrapGAppsHook3,
+  zxing-cpp,
   withWebengine ? true,
 
   # for pjsip
@@ -241,6 +245,8 @@ stdenv.mkDerivation rec {
     sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
     sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt
     cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
   '';
 
   preConfigure = ''
@@ -265,7 +271,10 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ffmpeg_6
+    html-tidy
+    hunspell
     libnotify
+    md4c
     networkmanager
     qtbase
     qt5compat
@@ -276,6 +285,7 @@ stdenv.mkDerivation rec {
     qtpositioning
     qtsvg
     qtwebchannel
+    zxing-cpp
   ]
   ++ lib.optionals withWebengine [ qtwebengine ];
 

From 8fb5f3a7da9cd44002cb2c685a7f4f45b0cab198 Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Sat, 9 Aug 2025 17:55:07 +0800
Subject: [PATCH 2/2] jami: move to by-name

---
 .../ja/jami/package.nix}                      | 43 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  6 ---
 2 files changed, 19 insertions(+), 30 deletions(-)
 rename pkgs/{applications/networking/instant-messengers/jami/default.nix => by-name/ja/jami/package.nix} (93%)

diff --git a/pkgs/applications/networking/instant-messengers/jami/default.nix b/pkgs/by-name/ja/jami/package.nix
similarity index 93%
rename from pkgs/applications/networking/instant-messengers/jami/default.nix
rename to pkgs/by-name/ja/jami/package.nix
index 26ca498f87ba..e520810a67bc 100644
--- a/pkgs/applications/networking/instant-messengers/jami/default.nix
+++ b/pkgs/by-name/ja/jami/package.nix
@@ -17,10 +17,10 @@
   gmp,
   gnutls,
   llhttp,
-  jack,
   jsoncpp,
   libarchive,
   libgit2,
+  libjack2,
   libnatpmp,
   libpulseaudio,
   libupnp,
@@ -42,22 +42,12 @@
   git,
   networkmanager, # for libnm
   python3,
-  qttools, # for translations
-  wrapQtAppsHook,
   libnotify,
   md4c,
   html-tidy,
   hunspell,
-  qt5compat,
-  qtbase,
-  qtdeclarative,
   qrencode,
-  qtmultimedia,
-  qtnetworkauth,
-  qtpositioning,
-  qtsvg,
-  qtwebengine,
-  qtwebchannel,
+  qt6Packages,
   wrapGAppsHook3,
   zxing-cpp,
   withWebengine ? true,
@@ -210,7 +200,7 @@ stdenv.mkDerivation rec {
       gmp
       gnutls
       llhttp
-      jack
+      libjack2
       jsoncpp
       libarchive
       libgit2
@@ -261,12 +251,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     wrapGAppsHook3
-    wrapQtAppsHook
+    qt6Packages.wrapQtAppsHook
     pkg-config
     cmake
     git
     python3
-    qttools
+    qt6Packages.qttools # for translations
   ];
 
   buildInputs = [
@@ -276,18 +266,23 @@ stdenv.mkDerivation rec {
     libnotify
     md4c
     networkmanager
-    qtbase
-    qt5compat
     qrencode
-    qtnetworkauth
-    qtdeclarative
-    qtmultimedia
-    qtpositioning
-    qtsvg
-    qtwebchannel
     zxing-cpp
   ]
-  ++ lib.optionals withWebengine [ qtwebengine ];
+  ++ (
+    with qt6Packages;
+    [
+      qtbase
+      qt5compat
+      qtnetworkauth
+      qtdeclarative
+      qtmultimedia
+      qtpositioning
+      qtsvg
+      qtwebchannel
+    ]
+    ++ lib.optionals withWebengine [ qtwebengine ]
+  );
 
   cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f64bfcdaa731..afc84a7b580c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16304,12 +16304,6 @@ with pkgs;
 
   sieveshell = with python3.pkgs; toPythonApplication managesieve;
 
-  jami = qt6Packages.callPackage ../applications/networking/instant-messengers/jami {
-    # TODO: remove once `udev` is `systemdMinimal` everywhere.
-    udev = systemdMinimal;
-    jack = libjack2;
-  };
-
   gpio-utils = callPackage ../os-specific/linux/kernel/gpio-utils.nix { };
 
   inherit (callPackage ../applications/misc/zettlr { }) zettlr;