Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

nix: use --system build flag instead of relying on $ZIG_GLOBAL_CACHE_DIR (#5434)

Browse Source 
Fixes #5431
This commit is contained in:
Mitchell Hashimoto
2025-01-30 08:48:31 -08:00
committed by GitHub
parent a62b26cd2f 40973417d0
commit adf4066b69
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nix/package.nix
View File

@ -40,7 +40,7 @@
# ultimately acted on and has made its way to a nixpkgs implementation, this # ultimately acted on and has made its way to a nixpkgs implementation, this
# can probably be removed in favor of that. # can probably be removed in favor of that.
zig_hook = zig_0_13.hook.overrideAttrs { zig_hook = zig_0_13.hook.overrideAttrs {
zig_default_flags = "-Dcpu=baseline -Doptimize=${optimize}"; zig_default_flags = "-Dcpu=baseline -Doptimize=${optimize} --color off";
}; };
# We limit source like this to try and reduce the amount of rebuilds as possible # We limit source like this to try and reduce the amount of rebuilds as possible
@ -162,13 +162,13 @@ in
dontConfigure = true; dontConfigure = true;
zigBuildFlags = "-Dversion-string=${finalAttrs.version}-${revision}-nix -Dgtk-x11=${lib.boolToString enableX11} -Dgtk-wayland=${lib.boolToString enableWayland}"; zigBuildFlags = [
"--system"
preBuild = '' "${zigCache}/p"
rm -rf $ZIG_GLOBAL_CACHE_DIR "-Dversion-string=${finalAttrs.version}-${revision}-nix"
cp -r --reflink=auto ${zigCache} $ZIG_GLOBAL_CACHE_DIR "-Dgtk-x11=${lib.boolToString enableX11}"
chmod u+rwX -R $ZIG_GLOBAL_CACHE_DIR "-Dgtk-wayland=${lib.boolToString enableWayland}"
''; ];
outputs = [ outputs = [
"out" "out"