diff --git a/doc/hooks/zig.section.md b/doc/hooks/zig.section.md index 4bd65746e0dd..e831b70e55ce 100644 --- a/doc/hooks/zig.section.md +++ b/doc/hooks/zig.section.md @@ -32,6 +32,10 @@ stdenv.mkDerivation { The variables below are exclusive to `zig`. +#### `dontUseZigConfigure` {#dont-use-zig-configure} + +Disables using `zigConfigurePhase`. + #### `dontUseZigBuild` {#dont-use-zig-build} Disables using `zigBuildPhase`. diff --git a/doc/redirects.json b/doc/redirects.json index 70df20ea1ac9..bd630c3f56a6 100644 --- a/doc/redirects.json +++ b/doc/redirects.json @@ -2762,6 +2762,9 @@ "index.html#zig-exclusive-variables", "index.html#zig-hook-exclusive-variables" ], + "dont-use-zig-configure": [ + "index.html#dont-use-zig-configure" + ], "dont-use-zig-build": [ "index.html#dont-use-zig-build" ], diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index bbd322c5641c..9be840e45308 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -4,9 +4,13 @@ readonly zigDefaultCpuFlag=@zig_default_cpu_flag@ readonly zigDefaultOptimizeFlag=@zig_default_optimize_flag@ -function zigSetGlobalCacheDir { +function zigConfigurePhase { + runHook preConfigure + ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) export ZIG_GLOBAL_CACHE_DIR + + runHook postConfigure } function zigBuildPhase { @@ -97,8 +101,9 @@ function zigInstallPhase { runHook postInstall } -# shellcheck disable=SC2154 -addEnvHooks "$hostOffset" zigSetGlobalCacheDir +if [ -z "${dontUseZigConfigure-}" ] && [ -z "${configurePhase-}" ]; then + configurePhase=zigConfigurePhase +fi if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then buildPhase=zigBuildPhase