diff options
author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2024-03-11 12:34:28 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-11 12:34:28 +0100 |
commit | b81b8d8e4819bb1714e69879a3f337cd83ed58aa (patch) | |
tree | acd75bfc561a27d177fa76ef7e1c50369406de8f /pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch | |
parent | 07970054294f84ff36d925275210e0fbaf060376 (diff) | |
parent | b2fc260cabcff7ea451a5449c00c0e5991c389fd (diff) | |
download | nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.gz nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.bz2 nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.lz nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.xz nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.tar.zst nixlib-b81b8d8e4819bb1714e69879a3f337cd83ed58aa.zip |
Merge pull request #283142 from wegank/bazel-4-drop
bazel_4: drop
Diffstat (limited to 'pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch')
-rw-r--r-- | pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch b/pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch deleted file mode 100644 index 1fa1e5748333..000000000000 --- a/pkgs/development/tools/build-managers/bazel/bazel_4/actions_path.patch +++ /dev/null @@ -1,41 +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 6fff2af..7e2877e 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 -index 95642767c6..39d3c62461 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 -@@ -74,6 +74,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 |