about summary refs log tree commit diff
path: root/pkgs/development/mobile
diff options
context:
space:
mode:
authorSander van der Burg <svanderburg@gmail.com>2018-12-01 00:08:21 +0100
committerSander van der Burg <svanderburg@gmail.com>2018-12-18 21:16:07 +0100
commit074c7e99e02d3529ea1bd592575dab1b32f5bdf7 (patch)
tree6f15f81548cb83fbf6ff7c9a54551198afb0d5a3 /pkgs/development/mobile
parentcb42643b9597e54f2e9018252a362b46cf9740f1 (diff)
Fix standalone generation script
Diffstat (limited to 'pkgs/development/mobile')
-rw-r--r--pkgs/development/mobile/androidenv/ndk-bundle/default.nix5
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
index a0ec8bb7b92e5..5d70a9f0a1cef 100644
--- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
+++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix
@@ -5,14 +5,14 @@ let
 in
 deployAndroidPackage {
   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 ];
   patchInstructions = lib.optionalString (os == "linux") ''
     patchShebangs .
 
     patch -p1 \
       --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
     rm -rf docs tests
@@ -47,4 +47,5 @@ deployAndroidPackage {
         ln -sf ../../libexec/android-sdk/ndk-bundle/$i $out/bin/$i
     done
   '';
+  noAuditTmpdir = true; # Audit script gets invoked by the build/ component in the path for the make standalone script
 }