From 74297e1ac8b761024c11d8e8cb413777cbc9789a Mon Sep 17 00:00:00 2001 From: Aliaksandr Date: Sat, 31 Jan 2026 23:01:12 +0200 Subject: [PATCH] goldendict-ng: move to by-name --- .../go/goldendict-ng/package.nix} | 25 +++++++------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 9 insertions(+), 17 deletions(-) rename pkgs/{applications/misc/goldendict-ng/default.nix => by-name/go/goldendict-ng/package.nix} (86%) diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/by-name/go/goldendict-ng/package.nix similarity index 86% rename from pkgs/applications/misc/goldendict-ng/default.nix rename to pkgs/by-name/go/goldendict-ng/package.nix index 3083af21c1da..600081eb7b6e 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/by-name/go/goldendict-ng/package.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c87b3f879ff8..28e8a7fe7623 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;