Merge pull request #115229 from rolfschr/android-fix-shebang-in-make-standalone-toolchain
This commit is contained in:
commit
151d746ab5
|
@ -14,10 +14,14 @@ deployAndroidPackage {
|
||||||
patchInstructions = lib.optionalString (os == "linux") (''
|
patchInstructions = lib.optionalString (os == "linux") (''
|
||||||
patchShebangs .
|
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) ''
|
'' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) ''
|
||||||
patch -p1 \
|
patch -p1 \
|
||||||
--no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true
|
--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
|
# TODO: allow this stuff
|
||||||
|
|
Loading…
Reference in a new issue