From 370f7de9e4bdaf0587476edf9718f5f5e5c55a3e Mon Sep 17 00:00:00 2001
From: Don Williams <don.e.williams@gmail.com>
Date: Mon, 29 Dec 2025 13:30:38 -0500
Subject: [PATCH] Fixing update-hyprland (again) to use env-tags

 On branch development
 Your branch is up to date with 'origin/development'.

 Changes to be committed:
	modified:   update-hyprland.sh
---
 update-hyprland.sh | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/update-hyprland.sh b/update-hyprland.sh
index 3241c47..dc26019 100755
--- a/update-hyprland.sh
+++ b/update-hyprland.sh
@@ -55,6 +55,7 @@ FETCH_LATEST=0
 RESTORE=0
 VIA_HELPER=0
 NO_FETCH=0
+USE_SYSTEM_LIBS=1
 ONLY_LIST=""
 SKIP_LIST=""
 SET_ARGS=()
@@ -220,6 +221,18 @@ run_stack() {
         fi
     done < "$TAGS_FILE"
 
+    # Ensure toolchain paths prefer /usr/local for pkg-config and cmake finds
+    export PATH="/usr/local/bin:${PATH}"
+    export PKG_CONFIG_PATH="/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig:${PKG_CONFIG_PATH:-}"
+    export CMAKE_PREFIX_PATH="/usr/local:${CMAKE_PREFIX_PATH:-}"
+
+    # Propagate system/bundled selection to hyprland.sh
+    if [[ $USE_SYSTEM_LIBS -eq 1 ]]; then
+        export USE_SYSTEM_HYPRLIBS=1
+    else
+        export USE_SYSTEM_HYPRLIBS=0
+    fi
+
     # Optionally install dependencies (not dry-run)
     if [[ $WITH_DEPS -eq 1 ]]; then
         echo "[INFO] Installing dependencies via 00-dependencies.sh" | tee -a "$SUMMARY_LOG"
@@ -462,6 +475,14 @@ while [[ $# -gt 0 ]]; do
         ONLY_LIST=${2:-}
         shift 2
         ;;
+    --bundled)
+        USE_SYSTEM_LIBS=0
+        shift
+        ;;
+    --system)
+        USE_SYSTEM_LIBS=1
+        shift
+        ;;
     --skip)
         SKIP_LIST=${2:-}
         shift 2