From 907874192f37fbbc56403208a3c71210518dc460 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 2 Sep 2025 02:07:34 +0800 Subject: [PATCH 1/2] chiaki-ng: move to finalAttrs pattern --- pkgs/games/chiaki-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index c230fe10768b..98c0fc1230e6 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -35,7 +35,7 @@ xxHash, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "chiaki-ng"; version = "1.9.8"; @@ -126,4 +126,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; mainProgram = "chiaki"; }; -} +}) From f5f12542f6c34c76e0fa0ca99bdbfe3a410802ae Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Tue, 2 Sep 2025 02:07:46 +0800 Subject: [PATCH 2/2] chiaki-ng: 1.9.8 -> 1.9.9 --- pkgs/games/chiaki-ng/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/games/chiaki-ng/default.nix index 98c0fc1230e6..3ec054b901ed 100644 --- a/pkgs/games/chiaki-ng/default.nix +++ b/pkgs/games/chiaki-ng/default.nix @@ -37,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "chiaki-ng"; - version = "1.9.8"; + version = "1.9.9"; src = fetchFromGitHub { owner = "streetpea"; repo = "chiaki-ng"; - rev = "v${version}"; - hash = "sha256-HQmXbi2diewA/+AMjlkyffvD73TkX6D+lMh+FL2Rcz4="; + rev = "v${finalAttrs.version}"; + hash = "sha256-7pDQnlElnBkW+Nr6R+NaylZbsGH8dB31nd7jxYD66yQ="; fetchSubmodules = true; }; @@ -87,12 +87,6 @@ stdenv.mkDerivation (finalAttrs: { xxHash ]; - # handle library name discrepancy when curl not built with cmake - postPatch = '' - substituteInPlace lib/CMakeLists.txt \ - --replace-fail 'libcurl_shared' 'libcurl' - ''; - cmakeFlags = [ "-Wno-dev" (lib.cmakeFeature "CHIAKI_USE_SYSTEM_CURL" "true")