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

build: update zig-wayland to use new LazyPath API (#4849)

Browse Source 
This is a more idiomatic way to handle build paths in Zig 0.13 and
later.
This commit is contained in:
Mitchell Hashimoto
2025-01-08 20:08:32 -08:00
committed by GitHub
parent 19ffb0b51f 622cc3f9c7
commit 1057fd23be
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig.zon
View File

@ -34,8 +34,8 @@
.hash = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25", .hash = "12207831bce7d4abce57b5a98e8f3635811cfefd160bca022eb91fe905d36a02cf25",
}, },
.zig_wayland = .{ .zig_wayland = .{
.url = "https://codeberg.org/ifreund/zig-wayland/archive/a5e2e9b6a6d7fba638ace4d4b24a3b576a02685b.tar.gz", .url = "https://codeberg.org/ifreund/zig-wayland/archive/0823d9116b80d65ecfad48a2efbca166c7b03497.tar.gz",
.hash = "1220d41b23ae70e93355bb29dac1c07aa6aeb92427a2dffc4375e94b4de18111248c", .hash = "12205e05d4db71ef30aeb3517727382c12d294968e541090a762689acbb9038826a1",
}, },
.zf = .{ .zf = .{
.url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd", .url = "git+https://github.com/natecraddock/zf/?ref=main#ed99ca18b02dda052e20ba467e90b623c04690dd",

2
nix/zigCacheHash.nix
View File

@ -1,3 +1,3 @@
# This file is auto-generated! check build-support/check-zig-cache-hash.sh for # This file is auto-generated! check build-support/check-zig-cache-hash.sh for
# more details. # more details.
"sha256-PnfSy793kcVt85q47kWR0xkivXoMOZAAmuUyKO9vqAI=" "sha256-MeSJiiSDDWZ7vUgY56t9aPSLPTgIKb4jexoHmDhJOGM="

12
src/build/SharedDeps.zig
View File

@ -435,15 +435,13 @@ pub fn add(
if (self.config.x11) step.linkSystemLibrary2("X11", dynamic_link_opts); if (self.config.x11) step.linkSystemLibrary2("X11", dynamic_link_opts);
if (self.config.wayland) { if (self.config.wayland) {
const scanner = Scanner.create(b, .{ const scanner = Scanner.create(b.dependency("zig_wayland", .{}), .{
// We shouldn't be using getPath but we need to for now // We shouldn't be using getPath but we need to for now
// https://codeberg.org/ifreund/zig-wayland/issues/66 // https://codeberg.org/ifreund/zig-wayland/issues/66
.wayland_xml_path = b.dependency("wayland", .{}) .wayland_xml = b.dependency("wayland", .{})
.path("protocol/wayland.xml") .path("protocol/wayland.xml"),
.getPath(b), .wayland_protocols = b.dependency("wayland_protocols", .{})
.wayland_protocols_path = b.dependency("wayland_protocols", .{}) .path(""),
.path("")
.getPath(b),
}); });
const wayland = b.createModule(.{ .root_source_file = scanner.result }); const wayland = b.createModule(.{ .root_source_file = scanner.result });