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

Merge pull request #115229 from rolfschr/android-fix-shebang-in-make-standalone-toolchain

Browse Source
This commit is contained in:
Sandro 2021-03-30 16:59:38 +02:00 committed by GitHub
commit 151d746ab5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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