From 7e9e48d28b136512f24f357047742ee6db3832f5 Mon Sep 17 00:00:00 2001
From: psadi <mail@adithyaps.xyz>
Date: Tue, 10 Mar 2026 09:24:57 +0530
Subject: [PATCH] fix: pickup zig version from the package

---
 .github/workflows/ci.yaml |  8 +-------
 bin/build-ghostty.sh      | 17 +++++++++++++++++
 bin/setup-env.sh          | 17 -----------------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b2b59a6..5a33a5e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -54,13 +54,7 @@ jobs:
 
       - name: Setup build environment
         run: |
-          if [ "${{ github.event_name }}" == "schedule" ]; then
-            ZIG_VERSION=0.15.2
-            echo "tip" > VERSION
-          else
-            ZIG_VERSION=0.14.0
-          fi
-          ZIG_VERSION=$ZIG_VERSION ./bin/setup-env.sh
+          ./bin/setup-env.sh
 
       - name: Build Ghostty
         run: |
diff --git a/bin/build-ghostty.sh b/bin/build-ghostty.sh
index a5112db..d9a3edf 100755
--- a/bin/build-ghostty.sh
+++ b/bin/build-ghostty.sh
@@ -40,6 +40,23 @@ rm "ghostty-${GHOSTTY_VERSION}.tar.gz" \
 
 BUILD_ARGS="${BUILD_ARGS} -Dversion-string=${GHOSTTY_VERSION}"
 
+# Configure Zig: https://ziglang.org
+ZIG_VERSION="$(cat "ghostty-${GHOSTTY_VERSION}/build.zig.zon" | grep ".minimum_zig_version" | cut -d'"' -f2)"
+CURRENT_ZIG_VERSION=$(zig version 2>/dev/null || true)
+if [ "$CURRENT_ZIG_VERSION" != "$ZIG_VERSION" ]; then
+	echo "Installing Zig ${ZIG_VERSION}..."
+	ZIG_PACKAGE_NAME="zig-${ARCH}-linux-${ZIG_VERSION}"
+	ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/${ZIG_PACKAGE_NAME}.tar.xz"
+	rm -rf /opt/zig*
+	unlink /usr/local/bin/zig || true
+	wget "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
+	tar -xJf /tmp/zig-linux.tar.xz -C /opt
+	ln -s "/opt/${ZIG_PACKAGE_NAME}/zig" /usr/local/bin/zig
+	echo "Zig ${ZIG_VERSION} installed successfully"
+else
+	echo "Zig ${ZIG_VERSION} is already installed, skipping installation"
+fi
+
 (
 	cd "ghostty-${GHOSTTY_VERSION}"
 	ZIG_GLOBAL_CACHE_DIR=/tmp/offline-cache ./nix/build-support/fetch-zig-cache.sh
diff --git a/bin/setup-env.sh b/bin/setup-env.sh
index 932b800..c5afb6e 100755
--- a/bin/setup-env.sh
+++ b/bin/setup-env.sh
@@ -16,7 +16,6 @@ pacman -Syuq --needed --noconfirm --noprogressbar ${buildDeps} ${ghosttyDeps}
 
 ARCH="$(uname -m)"
 
-ZIG_VERSION="${ZIG_VERSION:-0.14.0}"
 MINISIGN_VERSION="$(get_latest_gh_release 'jedisct1/minisign')"
 
 GH_BASE="https://github.com"
@@ -24,14 +23,6 @@ GH_USER_CONTENT="https://raw.githubusercontent.com"
 
 MINISIGN_URL="${GH_BASE}/jedisct1/minisign/releases/download/${MINISIGN_VERSION}/minisign-${MINISIGN_VERSION}-linux.tar.gz"
 
-ZIG_PACKAGE_NAME="zig-linux-${ARCH}-${ZIG_VERSION}"
-
-if [ "${ZIG_VERSION}" != "0.14.0" ]; then
-	ZIG_PACKAGE_NAME="zig-${ARCH}-linux-${ZIG_VERSION}"
-fi
-
-ZIG_URL="https://ziglang.org/download/${ZIG_VERSION}/${ZIG_PACKAGE_NAME}.tar.xz"
-
 DEBLOATED_PKGS="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/get-debloated-pkgs.sh"
 SHARUN="${GH_USER_CONTENT}/pkgforge-dev/Anylinux-AppImages/refs/heads/main/useful-tools/quick-sharun.sh"
 
@@ -40,14 +31,6 @@ wget "${DEBLOATED_PKGS}" -O /tmp/get-debloated-pkgs.sh
 chmod a+x /tmp/get-debloated-pkgs.sh
 sh /tmp/get-debloated-pkgs.sh --add-opengl --prefer-nano gtk4-mini libxml2-mini gdk-pixbuf2-mini librsvg-mini
 
-# Download & install other dependencies
-# zig: https://ziglang.org
-rm -rf /opt/zig*
-unlink /usr/local/bin/zig || true
-wget "${ZIG_URL}" -O /tmp/zig-linux.tar.xz
-tar -xJf /tmp/zig-linux.tar.xz -C /opt
-ln -s "/opt/${ZIG_PACKAGE_NAME}/zig" /usr/local/bin/zig
-
 # minisign: https://github.com/jedisct1/minisign
 rm -rf /usr/local/bin/minisign
 wget "${MINISIGN_URL}" -O /tmp/minisign-linux.tar.gz