From 6acf0bf645f8826940bc7aca9efd46fbdae69eae Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 5 Aug 2023 22:41:13 -0400 Subject: [PATCH] zigHook: support zig 0.11 --- pkgs/development/compilers/zig/hook.nix | 8 ++++++++ pkgs/development/compilers/zig/setup-hook.sh | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/zig/hook.nix b/pkgs/development/compilers/zig/hook.nix index df6304a34378..254a64597dd3 100644 --- a/pkgs/development/compilers/zig/hook.nix +++ b/pkgs/development/compilers/zig/hook.nix @@ -8,6 +8,14 @@ makeSetupHook { propagatedBuildInputs = [ zig ]; + substitutions = { + zig_default_flags = + if lib.versionAtLeast zig.version "0.11" then + "-Doptimize=ReleaseSafe -Dcpu=baseline" + else + "-Drelease-safe=true -Dcpu=baseline"; + }; + passthru = { inherit zig; }; meta = { diff --git a/pkgs/development/compilers/zig/setup-hook.sh b/pkgs/development/compilers/zig/setup-hook.sh index f514180692ea..f84a02a3268c 100644 --- a/pkgs/development/compilers/zig/setup-hook.sh +++ b/pkgs/development/compilers/zig/setup-hook.sh @@ -20,7 +20,7 @@ # https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485 # https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653 -readonly zigDefaultFlagsArray=("-Drelease-safe=true" "-Dcpu=baseline") +readonly zigDefaultFlagsArray=(@zig_default_flags@) function zigSetGlobalCacheDir { ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)