goldendict-ng: move to by-name

2026-02-10 02:05:25 +02:00
parent e0991b5eed
commit 74297e1ac8
2 changed files with 9 additions and 17 deletions
@@ -17,14 +17,7 @@
  bzip2,
  libiconv,
  libxtst,
-  qtbase,
-  qtsvg,
-  qtwebengine,
-  qttools,
-  qtwayland,
-  qt5compat,
-  qtmultimedia,
-  wrapQtAppsHook,
+  qt6,
  wrapGAppsHook3,
 }:

@@ -44,18 +37,18 @@ stdenv.mkDerivation (finalAttrs: {
  nativeBuildInputs = [
    pkg-config
    cmake
-    wrapQtAppsHook
+    qt6.wrapQtAppsHook
    wrapGAppsHook3
  ];

  buildInputs = [
-    qtbase
-    qtsvg
-    qttools
-    qtwebengine
-    qt5compat
-    qtmultimedia
-    qtwayland
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qttools
+    qt6.qtwebengine
+    qt6.qt5compat
+    qt6.qtmultimedia
+    qt6.qtwayland
    libvorbis
    tomlplusplus
    fmt
@@ -9823,7 +9823,6 @@ with pkgs;
  gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;

  goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
-  goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };

  inherit (ocamlPackages) google-drive-ocamlfuse;