diff --git a/testing/ghostty/APKBUILD b/testing/ghostty/APKBUILD index c8fe9aef2c8..bfe75b62f12 100644 --- a/testing/ghostty/APKBUILD +++ b/testing/ghostty/APKBUILD @@ -41,6 +41,7 @@ builddir="$srcdir/ghostty-$_commit" source=" https://github.com/ghostty-org/ghostty/archive/$_commit/ghostty-$_commit.tar.gz 0001-ReleaseSafe-is-not-debug.patch + zig-0.14.patch " prepare() { @@ -84,4 +85,5 @@ package() { sha512sums=" 467b9f85b46557532e3c63780cabbfe827228f43370627354d9af4909086e49331f6028ff5181b4ffbf12daf101503e11d8cd3c1c582a23b50fd2b214cd0d499 ghostty-ce7846860f5f74b65142fc2af6ed883a178249f8.tar.gz 946fba6145cfcafe7ffdce908eb02fb84c0f235efe74e23feb17fa32dfa88255ab3370730c053b126da6a7469cc6be95b338732dfeb4ecfbdbed9517187c3428 0001-ReleaseSafe-is-not-debug.patch +86f989ab63e5d6319737571473b1e74a4eeb2dbf72d0bc51fc4cdf3a76abf1f4dc51b559cc26bcf26bb96e61a479bb70b26288d889b51fcfbfc37d6730ddfec5 zig-0.14.patch " diff --git a/testing/ghostty/zig-0.14.patch b/testing/ghostty/zig-0.14.patch new file mode 100644 index 00000000000..9eccaf385b6 --- /dev/null +++ b/testing/ghostty/zig-0.14.patch @@ -0,0 +1,30 @@ +Patch-Source: https://github.com/ghostty-org/ghostty/commit/99bde549af7a6ea9fbfe47ca16f6ec50bd10ab80 +(with unrelated diffs removed) +--- +From 99bde549af7a6ea9fbfe47ca16f6ec50bd10ab80 Mon Sep 17 00:00:00 2001 +From: Mitchell Hashimoto +Date: Wed, 12 Mar 2025 13:53:28 -0700 +Subject: [PATCH] fix /usr/lib issues + +--- + src/build/GhosttyExe.zig | 2 +- + src/build/SharedDeps.zig | 5 ++++- + src/os/wasm.zig | 2 +- + 3 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/build/SharedDeps.zig b/src/build/SharedDeps.zig +index 18f43b3876..ae9f09afe2 100644 +--- a/src/build/SharedDeps.zig ++++ b/src/build/SharedDeps.zig +@@ -277,7 +277,10 @@ pub fn add( + // on x86_64. + if (step.rootModuleTarget().os.tag == .linux) { + const triple = try step.rootModuleTarget().linuxTriple(b.allocator); +- step.addLibraryPath(.{ .cwd_relative = b.fmt("/usr/lib/{s}", .{triple}) }); ++ const path = b.fmt("/usr/lib/{s}", .{triple}); ++ if (std.fs.accessAbsolute(path, .{})) { ++ step.addLibraryPath(.{ .cwd_relative = path }); ++ } else |_| {} + } + + // C files