diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2021-03-30 16:59:38 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-30 16:59:38 +0200 |
| commit | 151d746ab5476fa36727e5d76b85fb8616069bd3 (patch) | |
| tree | ded6c1fdda3ffdf90dfbf2c0e09c0f91a88373a3 /pkgs/development/mobile | |
| parent | 83fccd0edb0979b860be6d8e87b803e7625cc991 (diff) | |
| parent | c03f846b46705d282b047a15175203afa3776ed0 (diff) | |
| download | nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.tar nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.tar.gz nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.tar.bz2 nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.tar.lz nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.tar.xz nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.tar.zst nixpkgs-151d746ab5476fa36727e5d76b85fb8616069bd3.zip | |
Merge pull request #115229 from rolfschr/android-fix-shebang-in-make-standalone-toolchain
Diffstat (limited to 'pkgs/development/mobile')
| -rw-r--r-- | pkgs/development/mobile/androidenv/ndk-bundle/default.nix | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index f74b949a7b3..26d6a847b4d 100644 --- a/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -14,10 +14,14 @@ deployAndroidPackage { patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . + # Fix the shebangs of the auto-generated scripts. + substituteInPlace ./build/tools/make_standalone_toolchain.py \ + --replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' + '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' patch -p1 \ --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true - wrapProgram $(pwd)/build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" + wrapProgram ./build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" '' + '' # TODO: allow this stuff |