summary refs log tree commit diff
path: root/pkgs/tools/compression
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-06-07 09:25:46 +0200
committerFrederik Rietdijk <fridh@fridh.nl>2020-06-07 09:25:46 +0200
commitd0532e79ae545f3fcb7fafe58c05e58c8115a0e0 (patch)
tree5162faa0055599c44e312ee80a2748b50dc24e4f /pkgs/tools/compression
parent98c44f565746165a556953cda769d23d732466f4 (diff)
parent6b8223e634b1326f448b870351ae53a0607aa043 (diff)
downloadnixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.tar
nixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.tar.gz
nixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.tar.bz2
nixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.tar.lz
nixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.tar.xz
nixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.tar.zst
nixpkgs-d0532e79ae545f3fcb7fafe58c05e58c8115a0e0.zip
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/compression')
-rw-r--r--pkgs/tools/compression/hactool/default.nix8
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix
index 77382d980e5..c0bcca2d8cd 100644
--- a/pkgs/tools/compression/hactool/default.nix
+++ b/pkgs/tools/compression/hactool/default.nix
@@ -2,19 +2,21 @@
 
 stdenv.mkDerivation {
   pname = "hactool";
-  version = "1.3.3";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "SciresM";
     repo = "hactool";
-    rev = "1.3.3";
-    sha256 = "1qb51fck7liqc1ridms8wdlzgbdbvp6iv4an8jvmzhcj5p5xq631";
+    rev = "1.4.0";
+    sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d";
   };
 
   preBuild = ''
     mv config.mk.template config.mk
   '';
 
+  makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "CC=cc" ];
+
   installPhase = ''
     install -D hactool $out/bin/hactool
   '';