From 2a0f6604f28915ea2fb980fc16adef40cd32e3b3 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Mon, 22 Dec 2025 13:09:07 -0800 Subject: [PATCH] zf: use new zig setup-hook --- pkgs/by-name/zf/zf/package.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix index 1f3cea51152d..1090bc7267c1 100644 --- a/pkgs/by-name/zf/zf/package.nix +++ b/pkgs/by-name/zf/zf/package.nix @@ -8,12 +8,6 @@ callPackage, }: -let - zig = zig_0_15; - zig_hook = zig.hook.overrideAttrs { - zig_default_flags = "-Dcpu=baseline -Doptimize=ReleaseFast --color off"; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "zf"; upstreamVersion = "0.10.3"; @@ -29,16 +23,20 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ installShellFiles - zig_hook + zig_0_15 ]; deps = callPackage ./deps.nix { name = "${finalAttrs.pname}-cache-${finalAttrs.version}"; }; + dontSetZigDefaultFlags = true; + zigBuildFlags = [ "--system" "${finalAttrs.deps}" + "-Dcpu=baseline" + "-Doptimize=ReleaseFast" ]; postInstall = ''