zig: fix cache folder handling

- `env.ZIG_GLOBAL_CACHE_DIR` does not resolve variables, so
all actions had their cache dir in the current directory, named
'$TMPDIR/zig-cache'.
- zig cache does not conflict, so it's totally fine to reuse it in both
  build and tests (thus removing `--cache-dir`).

While we're at this, fix a `substituteInPlace` deprecation warning.
This commit is contained in:
Motiejus Jakštys
2024-10-20 20:14:19 +03:00
parent 930dee9882
commit 5cdff541c3
+5 -3
View File
@@ -46,7 +46,9 @@ stdenv.mkDerivation (finalAttrs: {
"/System/Library/CoreServices/SystemVersion.plist"
];
env.ZIG_GLOBAL_CACHE_DIR = "$TMPDIR/zig-cache";
preBuild = ''
export ZIG_GLOBAL_CACHE_DIR="$TMPDIR/zig-cache";
'';
# Zig's build looks at /usr/bin/env to find dynamic linking info. This doesn't
# work in Nix's sandbox. Use env from our coreutils instead.
@@ -55,14 +57,14 @@ stdenv.mkDerivation (finalAttrs: {
--replace "/usr/bin/env" "${coreutils}/bin/env"
'' else ''
substituteInPlace lib/std/zig/system/NativeTargetInfo.zig \
--replace "/usr/bin/env" "${coreutils}/bin/env"
--replace-fail "/usr/bin/env" "${coreutils}/bin/env"
'';
doInstallCheck = true;
installCheckPhase = ''
runHook preInstallCheck
$out/bin/zig test --cache-dir "$TMPDIR/zig-test-cache" -I $src/test $src/test/behavior.zig
$out/bin/zig test -I $src/test $src/test/behavior.zig
runHook postInstallCheck
'';