Merge staging-next into staging

2020-06-07 09:25:46 +02:00
parent 98c44f5657 6b8223e634
commit d0532e79ae
105 changed files with 2176 additions and 2163 deletions
@@ -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
  '';