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

Fix standalone generation script

Browse Source
This commit is contained in:
Sander van der Burg 2018-12-01 00:08:21 +01:00
parent cb42643b95
commit 074c7e99e0
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
View File

@ -5,14 +5,14 @@ let
in in
deployAndroidPackage { deployAndroidPackage {
inherit package os; inherit package os;
buildInputs = [ autoPatchelfHook makeWrapper ] buildInputs = [ autoPatchelfHook makeWrapper pkgs.python2 ]
++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ]; ++ lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out ];
patchInstructions = lib.optionalString (os == "linux") '' patchInstructions = lib.optionalString (os == "linux") ''
patchShebangs . patchShebangs .
patch -p1 \ patch -p1 \
--no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch}
wrapProgram build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}"
# TODO: allow this stuff # TODO: allow this stuff
rm -rf docs tests rm -rf docs tests
@ -47,4 +47,5 @@ deployAndroidPackage {
ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
done done
''; '';
noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
} }