summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorRyan Mulligan <ryan@ryantm.com>2020-11-23 20:39:25 -0800
committerGitHub <noreply@github.com>2020-11-23 20:39:25 -0800
commit28ee64cd0de260e2409ef75653cbcd88b595ec4e (patch)
treec712f9a3eaf58d242e68493438f41f797a22db47 /pkgs
parent24751380feeb4e3e827e2f8b016293a37fd8e76d (diff)
parent09852dfc4cad0b18226ff329086d8844daaed4fe (diff)
downloadnixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.tar
nixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.tar.gz
nixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.tar.bz2
nixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.tar.lz
nixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.tar.xz
nixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.tar.zst
nixpkgs-28ee64cd0de260e2409ef75653cbcd88b595ec4e.zip
Merge pull request #86310 from marius851000/ctrtool
ctrtool: 0.16 -> 0.7 and fix cross compiling
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/tools/archivers/ctrtool/default.nix9
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/archivers/ctrtool/default.nix b/pkgs/tools/archivers/ctrtool/default.nix
index 97abeadffc0..4b8eb4dfab2 100644
--- a/pkgs/tools/archivers/ctrtool/default.nix
+++ b/pkgs/tools/archivers/ctrtool/default.nix
@@ -2,22 +2,23 @@
 
 stdenv.mkDerivation rec {
   pname = "ctrtool";
-  version = "0.16";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner  = "jakcron";
     repo   = "Project_CTR";
-    rev    = "v${version}";
-    sha256 = "1n3j3fd1bqd39v5bdl9mhq4qdrcl1k4ib1yzl3qfckaz3y8bkrap";
+    rev    = "ctrtool-v${version}";
+    sha256 = "07aayck82w5xcp3si35d7ghybmrbqw91fqqvmbpjrjcixc6m42z7";
   };
 
   sourceRoot = "source/ctrtool";
 
+  makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "CXX=${stdenv.cc.targetPrefix}c++"];
   enableParallelBuilding = true;
 
   installPhase = "
     mkdir $out/bin -p
-    cp ctrtool $out/bin/ctrtool
+    cp ctrtool${stdenv.hostPlatform.extensions.executable} $out/bin/
   ";
 
   meta = with stdenv.lib; {