Make zig happy with /usr/bin/env

jmbaur · Feb 15, 2025 · 3c843d0 · 3c843d0
1 parent 27ba0b2
commit 3c843d0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/build.zig b/build.zig
@@ -6,7 +6,10 @@ const TBOOT_INITRD_NAME = "tboot-initrd";
 pub fn build(b: *std.Build) !void {
     const target = b.standardTargetOptions(
         .{
-            .default_target = .{ .cpu_model = .baseline, .abi = .musl },
+            .default_target = .{
+                .cpu_model = .baseline,
+                .abi = .musl,
+            },
         },
     );
 

diff --git a/pkgs/tinyboot/default.nix b/pkgs/tinyboot/default.nix
@@ -5,6 +5,7 @@
   withTools,
   zigForTinyboot,
 
+  bubblewrap,
   callPackage,
   lib,
   openssl,
@@ -20,9 +21,12 @@ let
       "musl" = "musl";
     }
     .${stdenv.hostPlatform.libc} or "none";
+
+  # Using zig-overlay (without the patches from nixpkgs) does not work well when
+  # doing sandboxed builds because of the following issue: https://github.com/ziglang/zig/issues/15898.
+  # Providing a /usr/bin/env for zig fixes some issues.
+  bwrap = "bwrap --ro-bind $(command -v env) /usr/bin/env --bind /nix/store /nix/store --bind /build /build --proc /proc --dev /dev";
 in
-# Using zig-overlay (without the patches from nixpkgs) does not work well when
-# doing sandboxed builds because of the following issue: https://github.com/ziglang/zig/issues/15898
 assert stdenv.hostPlatform.isStatic && stdenv.hostPlatform.libc == "musl";
 assert withTools != withLoader;
 stdenv.mkDerivation {
@@ -43,6 +47,7 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
+    bubblewrap
     zigForTinyboot
   ] ++ lib.optional (!withTools) tinybootTools;
 
@@ -51,38 +56,30 @@ stdenv.mkDerivation {
     ++ lib.optional (withTools || stdenv.buildPlatform.canExecute stdenv.hostPlatform) xz # tboot-initrd
   ;
 
-  zigBuildFlags =
-    [
-      "--release=safe"
-      "-Dcpu=baseline"
-      "-Dtarget=${stdenv.hostPlatform.qemuArch}-${stdenv.hostPlatform.parsed.kernel.name}-${zigLibc}"
-      "-Ddynamic-linker=${stdenv.cc.bintools.dynamicLinker}"
-      "-Dloader=${lib.boolToString withLoader}"
-      "-Dtools=${lib.boolToString withTools}"
-    ]
-    ++ lib.optionals (firmwareDirectory != null) [
-      "-Dfirmware-directory=${firmwareDirectory}"
-    ];
-
   dontInstall = true;
   doCheck = true;
 
   configurePhase = ''
     runHook preConfigure
     export ZIG_GLOBAL_CACHE_DIR=$TEMPDIR
     ln -s ${callPackage ../../build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
+    zigBuildFlags=("-Dloader=${lib.boolToString withLoader}" "-Dtools=${lib.boolToString withTools}" "--release=safe" "-Dtarget=${stdenv.hostPlatform.qemuArch}-${stdenv.hostPlatform.parsed.kernel.name}-${zigLibc}")
+    zigBuildFlags+=("-Ddynamic-linker=$(echo ${stdenv.cc.bintools.dynamicLinker})") # can contain a glob
+    ${lib.optionalString (firmwareDirectory != null) ''
+      zigBuildFlags+=("-Dfirmware-directory=${firmwareDirectory}")
+    ''}
     runHook postConfigure
   '';
 
   buildPhase = ''
     runHook preBuild
-    zig build install --prefix $out $zigBuildFlags
+    ${bwrap} zig build install --prefix $out ''${zigBuildFlags[@]}
     runHook postBuild
   '';
 
   checkPhase = ''
     runHook preCheck
-    zig build test $zigBuildFlags
+    ${bwrap} zig build test ''${zigBuildFlags[@]}
     runHook postCheck
   '';