diff options
| -rw-r--r-- | build.zig | 6 | ||||
| -rw-r--r-- | build.zig.zon | 10 |
2 files changed, 10 insertions, 6 deletions
@@ -250,7 +250,11 @@ pub fn build(b: *std.Build) void { // `b.dependency` below would end the configure to fetch its own alone. const ts = treeSitter(b, io, target, c_optimize, tree_sitter_grammars); inline for (.{ "cloud9", "vaxis", "ghostty", "uucode", "zstbi", "mvzr", "zstd", "xitdb" }) |name| { - if (!std.Build.package_map.get(@field(zon.dependencies, name).hash).?.available) _ = b.lazyDependency(name, .{}); + // One by path (cloud9, until its pin returns) is there already. + const dep = @field(zon.dependencies, name); + if (@hasField(@TypeOf(dep), "hash")) if (!std.Build.package_map.get(dep.hash).?.available) { + _ = b.lazyDependency(name, .{}); + }; } const cloud9 = b.dependency("cloud9", .{ .target = target, .optimize = optimize }).module("cloud9"); for (core_mods) |mod| mod.addImport("cloud9", cloud9); diff --git a/build.zig.zon b/build.zig.zon index ab6a693d..0c82860b 100644 --- a/build.zig.zon +++ b/build.zig.zon @@ -14,11 +14,11 @@ // `[email protected]:~gbrls/cloud9`; zig has no git+ssh support, so the // read-only HTTPS URL is what a manifest can carry. Re-pin with // `zig fetch --save=cloud9 git+https://git.sr.ht/~gbrls/cloud9#<commit>`. - .cloud9 = .{ - .url = "git+https://git.sr.ht/~gbrls/cloud9#0702e33bcfadf0abd9ccbaa8b681a19a84c332fe", - .hash = "cloud9-0.1.0-yt86qkExHgCRI7_eJsztRECamioWguBj2mTFsJ5N-AOn", - .lazy = true, - }, + // + // For now the sibling checkout, by path: the command line's `fs` + // verbs are cloud9's new Fsys and verbs, not published yet. The pin + // (it was 0702e33b) returns once that cloud9 is pushed. + .cloud9 = .{ .path = "../cloud9", .lazy = true }, // Pinned to the exact libvaxis commit ghostty is built against, so it // is compatible with ghostty's uucode configuration (the one we share // with it via `external_uucode` in build.zig). |
