diff options
author | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2023-12-18 21:00:20 +0100 |
---|---|---|
committer | Guillaume Maudoux <guillaume.maudoux@tweag.io> | 2023-12-18 21:00:20 +0100 |
commit | bfbc35e0d03599e8f23f9e10959cf31f8606c3f1 (patch) | |
tree | 4fffb51e634ef1f366fdccfec806fb076a283990 /pkgs/development/tools/build-managers | |
parent | 2a4700c48be3c6b58e06fc31a78924fe643a6bae (diff) | |
download | nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.tar nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.tar.gz nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.tar.bz2 nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.tar.lz nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.tar.xz nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.tar.zst nixlib-bfbc35e0d03599e8f23f9e10959cf31f8606c3f1.zip |
fixup! bazel_7: backport bazel_6 bash fixes for remote execution
Diffstat (limited to 'pkgs/development/tools/build-managers')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_7/actions_path.patch | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_7/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_7/actions_path.patch deleted file mode 100644 index 3821b6a8c9dc..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_7/actions_path.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java -index 8284eff943..a820037968 100644 ---- a/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java -+++ b/src/main/java/com/google/devtools/build/lib/exec/local/PosixLocalEnvProvider.java -@@ -47,6 +47,16 @@ public final class PosixLocalEnvProvider implements LocalEnvProvider { - Map<String, String> env, BinTools binTools, String fallbackTmpDir) { - ImmutableMap.Builder<String, String> result = ImmutableMap.builder(); - result.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); -+ -+ // In case we are running on NixOS. -+ // If bash is called with an unset PATH on this platform, -+ // it will set it to /no-such-path and default tools will be missings. -+ // See, https://github.com/NixOS/nixpkgs/issues/94222 -+ // So we ensure that minimal dependencies are present. -+ if (!env.containsKey("PATH")){ -+ result.put("PATH", "@actionsPathPatch@"); -+ } -+ - String p = clientEnv.get("TMPDIR"); - if (Strings.isNullOrEmpty(p)) { - // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR -diff --git a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java -index 8f230b1b1d..2e4c7d26b7 100644 ---- a/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java -+++ b/src/main/java/com/google/devtools/build/lib/exec/local/XcodeLocalEnvProvider.java -@@ -75,6 +75,16 @@ public final class XcodeLocalEnvProvider implements LocalEnvProvider { - - ImmutableMap.Builder<String, String> newEnvBuilder = ImmutableMap.builder(); - newEnvBuilder.putAll(Maps.filterKeys(env, k -> !k.equals("TMPDIR"))); -+ -+ // In case we are running on NixOS. -+ // If bash is called with an unset PATH on this platform, -+ // it will set it to /no-such-path and default tools will be missings. -+ // See, https://github.com/NixOS/nixpkgs/issues/94222 -+ // So we ensure that minimal dependencies are present. -+ if (!env.containsKey("PATH")){ -+ newEnvBuilder.put("PATH", "@actionsPathPatch@"); -+ } -+ - String p = clientEnv.get("TMPDIR"); - if (Strings.isNullOrEmpty(p)) { - // Do not use `fallbackTmpDir`, use `/tmp` instead. This way if the user didn't export TMPDIR |