diff options
| author | Vladimír Čunát <v@cunat.cz> | 2021-10-19 19:24:43 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2021-10-19 19:24:43 +0200 |
| commit | 01df3cd7dda0b22c056f15e22a690edb1040345a (patch) | |
| tree | 84f42f005fcc9c0ec71398325584387a06fe44b7 /pkgs/tools/compression | |
| parent | 3bd85fa720ceb2f1f0204e5b0410831f4b9f9254 (diff) | |
| parent | ef64a9a4fce0f2e482899de68323c27751ba97a3 (diff) | |
| download | nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.tar nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.tar.gz nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.tar.bz2 nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.tar.lz nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.tar.xz nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.tar.zst nixpkgs-01df3cd7dda0b22c056f15e22a690edb1040345a.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/compression')
| -rw-r--r-- | pkgs/tools/compression/hacpack/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/compression/hactool/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/tools/compression/hactool/musl-compat.patch | 13 |
3 files changed, 19 insertions, 0 deletions
diff --git a/pkgs/tools/compression/hacpack/default.nix b/pkgs/tools/compression/hacpack/default.nix index e60d483574b..34722d52ccf 100644 --- a/pkgs/tools/compression/hacpack/default.nix +++ b/pkgs/tools/compression/hacpack/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { mv config.mk.template config.mk ''; + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + enableParallelBuilding = true; + installPhase = '' mkdir -p $out/bin cp ./hacpack $out/bin diff --git a/pkgs/tools/compression/hactool/default.nix b/pkgs/tools/compression/hactool/default.nix index c6e0a3a2851..2e6e7437fff 100644 --- a/pkgs/tools/compression/hactool/default.nix +++ b/pkgs/tools/compression/hactool/default.nix @@ -11,11 +11,14 @@ stdenv.mkDerivation rec { sha256 = "0305ngsnwm8npzgyhyifasi4l802xnfz19r0kbzzniirmcn4082d"; }; + patches = [ ./musl-compat.patch ]; + preBuild = '' mv config.mk.template config.mk ''; makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ]; + enableParallelBuilding = true; installPhase = '' install -D hactool $out/bin/hactool diff --git a/pkgs/tools/compression/hactool/musl-compat.patch b/pkgs/tools/compression/hactool/musl-compat.patch new file mode 100644 index 00000000000..37d596f183f --- /dev/null +++ b/pkgs/tools/compression/hactool/musl-compat.patch @@ -0,0 +1,13 @@ +diff --git a/main.c b/main.c +index 07f53cb..f2265df 100644 +--- a/main.c ++++ b/main.c +@@ -369,7 +369,7 @@ int main(int argc, char **argv) { + return EXIT_FAILURE; + } + nca_ctx.tool_ctx->base_file_type = BASEFILE_FAKE; +- nca_ctx.tool_ctx->base_file++; /* Guarantees base_file != NULL. I'm so sorry. */ ++ if (!nca_ctx.tool_ctx->base_file) nca_ctx.tool_ctx->base_file = (FILE*) 1; + break; + case 32: + tool_ctx.action |= ACTION_ONLYUPDATEDROMFS; |