b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

android: replace '$(pwd)' by '.'

Browse source
This commit is contained in:
Rolf Schröder 2021-03-27 12:46:58 +01:00
parent 2985284ccb
commit c03f846b46
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/mobile/androidenv/ndk-bundle/default.nix
View file

@ -15,13 +15,13 @@ deployAndroidPackage {
patchShebangs . patchShebangs .
# Fix the shebangs of the auto-generated scripts. # Fix the shebangs of the auto-generated scripts.
substituteInPlace $(pwd)/build/tools/make_standalone_toolchain.py \ substituteInPlace ./build/tools/make_standalone_toolchain.py \
--replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' --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