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

bazel: patch #!/usr/bin/env bash

Browse Source 
To point to the custom bash instead of `/nix/store.../bin/env bash`.
This commit is contained in:
Andreas Herrmann 2019-08-19 14:28:23 +02:00 committed by Florian Klink
parent d132d47199
commit f6572b4e64
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/build-managers/bazel/default.nix
View File

@ -5,7 +5,7 @@
, lr, xe, zip, unzip, bash, writeCBin, coreutils , lr, xe, zip, unzip, bash, writeCBin, coreutils
, which, gawk, gnused, gnutar, gnugrep, gzip, findutils , which, gawk, gnused, gnutar, gnugrep, gzip, findutils
# updater # updater
, python3, writeScript , python27, python3, writeScript
# Apple dependencies # Apple dependencies
, cctools, libcxx, CoreFoundation, CoreServices, Foundation , cctools, libcxx, CoreFoundation, CoreServices, Foundation
# Allow to independently override the jdks used to build and run respectively # Allow to independently override the jdks used to build and run respectively
@ -328,10 +328,11 @@ stdenv.mkDerivation rec {
''; '';
genericPatches = '' genericPatches = ''
# Substitute python's stub shebang to plain python path. (see TODO add pr URL) # Substitute j2objc and objc wrapper's python shebang to plain python path.
# See also `postFixup` where python is added to $out/nix-support # See also `postFixup` where python is added to $out/nix-support
substituteInPlace src/main/java/com/google/devtools/build/lib/bazel/rules/python/python_stub_template.txt \ substituteInPlace tools/j2objc/j2objc_header_map.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
--replace "#!/usr/bin/env python" "#!${python3}/bin/python" substituteInPlace tools/j2objc/j2objc_wrapper.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
substituteInPlace tools/objc/j2objc_dead_code_pruner.py --replace "$!/usr/bin/python2.7" "#!${python27}/bin/python"
# md5sum is part of coreutils # md5sum is part of coreutils
sed -i 's|/sbin/md5|md5sum|' \ sed -i 's|/sbin/md5|md5sum|' \
@ -343,6 +344,8 @@ stdenv.mkDerivation rec {
# Only files containing /bin are taken into account. # Only files containing /bin are taken into account.
substituteInPlace "$path" \ substituteInPlace "$path" \
--replace /bin/bash ${customBash}/bin/bash \ --replace /bin/bash ${customBash}/bin/bash \
--replace "/usr/bin/env bash" ${customBash}/bin/bash \
--replace "/usr/bin/env python" ${python3}/bin/python \
--replace /usr/bin/env ${coreutils}/bin/env \ --replace /usr/bin/env ${coreutils}/bin/env \
--replace /bin/true ${coreutils}/bin/true --replace /bin/true ${coreutils}/bin/true
done done