From 15581ac653ca03fabd47e4c475968136e30cf93e Mon Sep 17 00:00:00 2001 From: Alex O'Brien <3541@3541.website> Date: Tue, 7 Apr 2026 10:06:47 +1000 Subject: [PATCH] bazel_9: fix linux-sandbox Applying PR #461754 to bazel_9. --- pkgs/by-name/ba/bazel_9/package.nix | 5 +++++ pkgs/by-name/ba/bazel_9/patches/linux_sandbox.patch | 13 +++++++++++++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/by-name/ba/bazel_9/patches/linux_sandbox.patch diff --git a/pkgs/by-name/ba/bazel_9/package.nix b/pkgs/by-name/ba/bazel_9/package.nix index 3adbe137608a..287b30e1c357 100644 --- a/pkgs/by-name/ba/bazel_9/package.nix +++ b/pkgs/by-name/ba/bazel_9/package.nix @@ -211,6 +211,11 @@ stdenv.mkDerivation rec { (replaceVars ./patches/usr_bin_env.patch { usrBinEnv = "${coreutils}/bin/env"; }) + + # Bazel tries to run "/bin/true" to test if linux-sandbox works. + (replaceVars ./patches/linux_sandbox.patch { + binTrue = "${coreutils}/bin/true"; + }) ]; meta = { diff --git a/pkgs/by-name/ba/bazel_9/patches/linux_sandbox.patch b/pkgs/by-name/ba/bazel_9/patches/linux_sandbox.patch new file mode 100644 index 000000000000..033f06a77403 --- /dev/null +++ b/pkgs/by-name/ba/bazel_9/patches/linux_sandbox.patch @@ -0,0 +1,13 @@ +diff --git a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java +index dc188b4ce2..46d338c9af 100644 +--- a/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java ++++ b/src/main/java/com/google/devtools/build/lib/sandbox/LinuxSandboxedSpawnRunner.java +@@ -106,7 +106,7 @@ final class LinuxSandboxedSpawnRunner extends AbstractSandboxSpawnRunner { + ImmutableList linuxSandboxArgv = + LinuxSandboxCommandLineBuilder.commandLineBuilder(linuxSandbox) + .setTimeout(options.getLocalSigkillGraceSeconds()) +- .buildForCommand(ImmutableList.of("/bin/true")); ++ .buildForCommand(ImmutableList.of("@binTrue@")); + ImmutableMap env = ImmutableMap.of(); + Path execRoot = cmdEnv.getExecRoot(); + File cwd = execRoot.getPathFile(); -- knotmirror 0.0.1