Skip to content

Commit f85ca63

Browse files
committed
We don't need to specify zig libc
1 parent 33d6abf commit f85ca63

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

pkgs/tinyboot/default.nix

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
xz,
1414
}:
1515

16-
let
17-
zigLibc =
18-
{
19-
"glibc" = "gnu";
20-
"musl" = "musl";
21-
}
22-
.${stdenv.hostPlatform.libc} or "none";
23-
in
2416
assert stdenv.hostPlatform.isStatic && stdenv.hostPlatform.libc == "musl";
2517
assert withTools != withLoader;
2618
stdenv.mkDerivation {
@@ -56,7 +48,7 @@ stdenv.mkDerivation {
5648
runHook preConfigure
5749
export ZIG_GLOBAL_CACHE_DIR=$TEMPDIR
5850
ln -s ${callPackage ../../build.zig.zon.nix { }} $ZIG_GLOBAL_CACHE_DIR/p
59-
zigBuildFlags=("-Dloader=${lib.boolToString withLoader}" "-Dtools=${lib.boolToString withTools}" "--release=safe" "-Dtarget=${stdenv.hostPlatform.qemuArch}-${stdenv.hostPlatform.parsed.kernel.name}-${zigLibc}")
51+
zigBuildFlags=("-Dloader=${lib.boolToString withLoader}" "-Dtools=${lib.boolToString withTools}" "--release=safe" "-Dtarget=${stdenv.hostPlatform.qemuArch}-${stdenv.hostPlatform.parsed.kernel.name}")
6052
zigBuildFlags+=("-Ddynamic-linker=$(echo ${stdenv.cc.bintools.dynamicLinker})") # can contain a glob
6153
${lib.optionalString (firmwareDirectory != null) ''
6254
zigBuildFlags+=("-Dfirmware-directory=${firmwareDirectory}")

0 commit comments

Comments
 (0)