From 73d8e2318ac304f434a683c0cf2e3766a3492993 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 18 Nov 2025 14:19:03 -0800 Subject: [PATCH 1/2] goldendict-ng: 25.05.0 -> 25.10.2 --- pkgs/applications/misc/goldendict-ng/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index b99886f953fc..3b3e79e14f24 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation { pname = "goldendict-ng"; - version = "25.05.0"; + version = "25.10.2"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - tag = "v25.05.0-Release.2a2b0e16"; - hash = "sha256-PBqkVac867xE4ZcvwTysAK6rQSoEZelKrV9USvFsaLk="; + tag = "v25.10.2-Release.673d1b90"; + hash = "sha256-afzMUko09vGmQvu6sob8jYfVUvQECoUdAmIbLIoh1Dw="; }; nativeBuildInputs = [ From e1c6f504a5634e3d94a359b47aa3f189c47a5b84 Mon Sep 17 00:00:00 2001 From: Yiyu Zhou Date: Tue, 18 Nov 2025 14:26:15 -0800 Subject: [PATCH 2/2] goldendict-ng: cleanup --- .../misc/goldendict-ng/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/misc/goldendict-ng/default.nix b/pkgs/applications/misc/goldendict-ng/default.nix index 3b3e79e14f24..4539c3606639 100644 --- a/pkgs/applications/misc/goldendict-ng/default.nix +++ b/pkgs/applications/misc/goldendict-ng/default.nix @@ -28,23 +28,26 @@ wrapGAppsHook3, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; version = "25.10.2"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; - tag = "v25.10.2-Release.673d1b90"; + tag = "v${finalAttrs.version}-Release.673d1b90"; hash = "sha256-afzMUko09vGmQvu6sob8jYfVUvQECoUdAmIbLIoh1Dw="; }; + strictDeps = true; + nativeBuildInputs = [ pkg-config cmake wrapQtAppsHook wrapGAppsHook3 ]; + buildInputs = [ qtbase qtsvg @@ -68,7 +71,7 @@ stdenv.mkDerivation { libzim ]; - # to prevent double wrapping of wrapQtApps and wrapGApps + # Prevent double wrapping of wrapQtApps and wrapGApps dontWrapGApps = true; preFixup = '' @@ -84,16 +87,16 @@ stdenv.mkDerivation { "-DUSE_SYSTEM_TOML=ON" ]; - meta = with lib; { + meta = { homepage = "https://xiaoyifang.github.io/goldendict-ng/"; description = "Advanced multi-dictionary lookup program"; - platforms = platforms.linux; + platforms = lib.platforms.linux; mainProgram = "goldendict"; - maintainers = with maintainers; [ + maintainers = with lib.maintainers; [ slbtty michojel linsui ]; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; }; -} +})