nur-packages

commit 78d1fcbfba61232e43c5ee38d2fb824aa92da25b
parent dc4944986c35b94ecf0643d693a6d15fae151531
Author: Nikolay Korotkiy <sikmir@disroot.org>
Date:   Sun, 21 May 2023 09:29:59 +0400

chdk: 6200 → 6239

Diffstat:
M
pkgs/default.nix
 | 
4
+++-
M
pkgs/embedded/chdk/default.nix
 | 
8
++++----

2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -112,7 +112,9 @@ lib.makeScope newScope (
 
     ### EMBEDDED
 
-    chdk = callPackage ./embedded/chdk { };
+    chdk = callPackage ./embedded/chdk {
+      gcc-arm-embedded = pkgs.gcc-arm-embedded-10;
+    };
     embox-aarch64 = callPackage ./embedded/embox { arch = "aarch64"; };
     embox-arm = callPackage ./embedded/embox { arch = "arm"; };
     embox-ppc = callPackage ./embedded/embox { arch = "ppc"; };
diff --git a/pkgs/embedded/chdk/default.nix b/pkgs/embedded/chdk/default.nix
@@ -5,7 +5,7 @@
 
 let
   version = "1.6.1";
-  revision = "6200"; # check on http://mighty-hoernsche.de/
+  revision = "6239"; # check on http://mighty-hoernsche.de/
   branch = "release-${lib.replaceStrings [ "." ] [ "_" ] (lib.versions.majorMinor version)}";
   optFI2 = fi2key != null && fi2iv != null;
   batchBuild = platform == null || platformsub == null;
@@ -18,17 +18,17 @@ stdenv.mkDerivation {
     url = "https://app.assembla.com/spaces/chdk/subversion/source/${revision}/branches/${branch}?_format=zip";
     extension = "zip";
     stripRoot = false;
-    hash = "sha256-m/sERI0Qrcwbv4VWUfLAVttD2KWpYtNpj6r6tXKs9PE=";
+    hash = "sha256-gqb9JvPyzW77wlpZJqg3IYaGafQIzFopzGy9MZbr8Zs=";
   };
 
   nativeBuildInputs = [ gcc-arm-embedded zip ];
 
-  buildFlags = [ "DEF_SVN_REF=${revision}" ]
+  buildFlags = [ "DEF_SVN_REF=${revision}" "HOSTCC=${stdenv.cc.targetPrefix}cc" ]
     ++ lib.optionals (optFI2 && !batchBuild) [ "OPT_FI2=1" "FI2KEY=${fi2key}" "FI2IV=${fi2iv}" ]
     ++ lib.optionals (!batchBuild) [ "PLATFORM=${platform}" "PLATFORMSUB=${platformsub}" "firzipsubcomplete" ]
     ++ lib.optional batchBuild "batch-zip-complete";
 
-  NIX_CFLAGS_COMPILE = "-Wno-format-security";
+  env.NIX_CFLAGS_COMPILE = "-Wno-format-security";
 
   installPhase = ''
     runHook preInstall