superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

nix: make sure zon2nix uses Zig 0.15 in generated files (#9220)

pull/9222/head
Jeffrey C. Ollie 2025-10-15 13:56:07 -05:00 committed by GitHub
parent c91bfb9dd5
commit 1caab0c208
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig.zon.nix generated
View File

@ -5,7 +5,7 @@
fetchurl, fetchurl,
fetchgit, fetchgit,
runCommandLocal, runCommandLocal,
zig_0_14, zig_0_15,
name ? "zig-packages", name ? "zig-packages",
}: let }: let
unpackZigArtifact = { unpackZigArtifact = {
@ -14,7 +14,7 @@
}: }:
runCommandLocal name runCommandLocal name
{ {
nativeBuildInputs = [zig_0_14]; nativeBuildInputs = [zig_0_15];
} }
'' ''
hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})" hash="$(zig fetch --global-cache-dir "$TMPDIR" ${artifact})"

2
nix/build-support/check-zig-cache.sh
View File

@ -79,7 +79,7 @@ elif [ "$1" != "--update" ]; then
exit 1 exit 1
fi fi
zon2nix "$BUILD_ZIG_ZON" --14 --nix "$WORK_DIR/build.zig.zon.nix" --txt "$WORK_DIR/build.zig.zon.txt" --json "$WORK_DIR/build.zig.zon.json" --flatpak "$WORK_DIR/zig-packages.json" zon2nix "$BUILD_ZIG_ZON" --15 --nix "$WORK_DIR/build.zig.zon.nix" --txt "$WORK_DIR/build.zig.zon.txt" --json "$WORK_DIR/build.zig.zon.json" --flatpak "$WORK_DIR/zig-packages.json"
alejandra --quiet "$WORK_DIR/build.zig.zon.nix" alejandra --quiet "$WORK_DIR/build.zig.zon.nix"
prettier --log-level warn --write "$WORK_DIR/build.zig.zon.json" prettier --log-level warn --write "$WORK_DIR/build.zig.zon.json"
prettier --log-level warn --write "$WORK_DIR/zig-packages.json" prettier --log-level warn --write "$WORK_DIR/zig-packages.json"