diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-11-11 00:02:47 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-11-11 00:02:47 +0000 |
commit | 5f5513224f3075c3bc76905121c9a3e06ec30dc4 (patch) | |
tree | ab1abc65028ce024e018c5f741b72e435d648330 /pkgs/development/tools/build-managers | |
parent | e8096ee1e1b78e17b362bf9daf67a46c8c02f28b (diff) | |
parent | 912311b7fd205f8542aaac6e26251bcb0b92fa7c (diff) | |
download | nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.gz nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.bz2 nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.lz nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.xz nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.tar.zst nixpkgs-5f5513224f3075c3bc76905121c9a3e06ec30dc4.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_6/default.nix | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix index 8fb37a9f666..de82eb54eb9 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_6/default.nix @@ -22,6 +22,7 @@ , file , substituteAll , writeTextFile +, writeShellApplication }: let @@ -128,6 +129,16 @@ let defaultShellPath = lib.makeBinPath defaultShellUtils; + bashWithDefaultShellUtils = writeShellApplication { + name = "bash"; + text = '' + if [[ "$PATH" == "/no-such-path" ]]; then + export PATH=${defaultShellPath} + fi + exec ${bash}/bin/bash "$@" + ''; + }; + platforms = lib.platforms.linux ++ lib.platforms.darwin; system = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; @@ -420,8 +431,8 @@ stdenv.mkDerivation rec { # If you add more replacements here, you must change the grep above! # Only files containing /bin are taken into account. substituteInPlace "$path" \ - --replace /bin/bash ${bash}/bin/bash \ - --replace "/usr/bin/env bash" ${bash}/bin/bash \ + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash \ + --replace "/usr/bin/env bash" ${bashWithDefaultShellUtils}/bin/bash \ --replace "/usr/bin/env python" ${python3}/bin/python \ --replace /usr/bin/env ${coreutils}/bin/env \ --replace /bin/true ${coreutils}/bin/true @@ -436,17 +447,17 @@ stdenv.mkDerivation rec { # bazel test runner include references to /bin/bash substituteInPlace tools/build_rules/test_rules.bzl \ - --replace /bin/bash ${bash}/bin/bash + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash for i in $(find tools/cpp/ -type f) do substituteInPlace $i \ - --replace /bin/bash ${bash}/bin/bash + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash done # Fixup scripts that generate scripts. Not fixed up by patchShebangs below. substituteInPlace scripts/bootstrap/compile.sh \ - --replace /bin/bash ${bash}/bin/bash + --replace /bin/bash ${bashWithDefaultShellUtils}/bin/bash # add nix environment vars to .bazelrc cat >> .bazelrc <<EOF |