kiwix: move to by-name

2026-02-10 02:05:33 +02:00
parent 2e1ebd17be
commit 8b8533f7c2
3 changed files with 7 additions and 14 deletions
@@ -5,12 +5,7 @@
  nix-update-script,
  libkiwix,
  pkg-config,
-  qmake,
-  qtbase,
-  qtwebengine,
-  qtsvg,
-  qtimageformats,
-  wrapQtAppsHook,
+  qt6,
  aria2,
 }:

@@ -30,17 +25,17 @@ stdenv.mkDerivation rec {
  ];

  nativeBuildInputs = [
-    qmake
+    qt6.qmake
    pkg-config
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
  ];

  buildInputs = [
    libkiwix
-    qtbase
-    qtwebengine
-    qtsvg
-    qtimageformats
+    qt6.qtbase
+    qt6.qtwebengine
+    qt6.qtsvg
+    qt6.qtimageformats
  ];

  qtWrapperArgs = [
@@ -10289,8 +10289,6 @@ with pkgs;

  k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };

-  kiwix = qt6Packages.callPackage ../applications/misc/kiwix { };
-
  klayout = libsForQt5.callPackage ../applications/misc/klayout { };

  kotatogram-desktop =