colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hactool: add musl support && enable parallel building

Browse Source
This commit is contained in:
Ivar Scholten 2021-10-19 11:11:03 +02:00
parent edf9cbe0c9
commit b5301cafbc
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/tools/compression/hactool/default.nix
View File

@ -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

13
pkgs/tools/compression/hactool/musl-compat.patch Normal file
View File

@ -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;