diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix index 7c14a55ba528..b08023c70e1c 100644 --- a/pkgs/by-name/gh/ghostty/package.nix +++ b/pkgs/by-name/gh/ghostty/package.nix @@ -29,13 +29,7 @@ # https://github.com/ghostty-org/ghostty/blob/4b4d4062dfed7b37424c7210d1230242c709e990/PACKAGING.md#build-options optimizeLevel ? "ReleaseFast", }: -let - zig = zig_0_14; - zig_hook = zig.hook.overrideAttrs { - zig_default_flags = "-Dcpu=baseline -Doptimize=${optimizeLevel} --color off"; - }; -in stdenv.mkDerivation (finalAttrs: { pname = "ghostty"; version = "1.2.3"; @@ -66,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { pandoc pkg-config removeReferencesTo - zig_hook + zig_0_14 # GTK frontend glib # Required for `glib-compile-schemas` @@ -93,10 +87,14 @@ stdenv.mkDerivation (finalAttrs: { harfbuzz ]; + dontSetZigDefaultFlags = true; + zigBuildFlags = [ "--system" "${finalAttrs.deps}" "-Dversion-string=${finalAttrs.version}" + "-Dcpu=baseline" + "-Doptimize=${optimizeLevel}" ] ++ lib.mapAttrsToList (name: package: "-fsys=${name} --search-prefix ${lib.getLib package}") { inherit glslang;