From ae89221446ebb5d4a82d22b0b671901745636dad Mon Sep 17 00:00:00 2001 From: Mike Kasberg Date: Fri, 31 Jan 2025 07:16:34 -0700 Subject: [PATCH] Fix Build for 1.1.0 Ghostty 1.1.0 has moved the bzip2 dependency to SharedDeps.zig. Need to update our build script to handle that. There are some other build errors with Ubuntu 22.04, let's remove that for now so we don't delay releasing this for 24.04+. --- .github/workflows/build.yml | 5 +++-- build-ghostty.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index cb610de..3e22d8b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -33,8 +33,9 @@ jobs: - name: arm64 runner: ubuntu-24.04-arm builds: - - distro: "ubuntu" - version: "22.04" + # Build errors with Ghostty 1.1. Can put this back when we fix the errors. + # - distro: "ubuntu" + # version: "22.04" - distro: "ubuntu" version: "24.04" - distro: "ubuntu" diff --git a/build-ghostty.sh b/build-ghostty.sh index 06fe9e0..c90cfc2 100755 --- a/build-ghostty.sh +++ b/build-ghostty.sh @@ -22,7 +22,7 @@ tar -xzmf "ghostty-$GHOSTTY_VERSION.tar.gz" cd "ghostty-$GHOSTTY_VERSION" # On Ubuntu it's libbz2, not libbzip2 -sed -i 's/linkSystemLibrary2("bzip2", dynamic_link_opts)/linkSystemLibrary2("bz2", dynamic_link_opts)/' build.zig +sed -i 's/linkSystemLibrary2("bzip2", dynamic_link_opts)/linkSystemLibrary2("bz2", dynamic_link_opts)/' src/build/SharedDeps.zig # Fetch Zig Cache ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/fetch-zig-cache.sh