From 9ea6cbb8fa1bcee917069978be8ee7f8d3006284 Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Mon, 6 Apr 2026 15:40:54 -0400
Subject: [PATCH] fix(guix-local-channel): apply all guix patches before
 renaming source dir

---
 steps-guix/improve/guix-daemon-and-pull.sh | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/steps-guix/improve/guix-daemon-and-pull.sh b/steps-guix/improve/guix-daemon-and-pull.sh
index c4b3a019..278f327a 100644
--- a/steps-guix/improve/guix-daemon-and-pull.sh
+++ b/steps-guix/improve/guix-daemon-and-pull.sh
@@ -122,6 +122,7 @@ verify_terminal_devices() {
 prepare_local_channel_checkout() {
     rendered_patch="/tmp/guix-bootstrap-local-seeds.patch"
     rendered_mes_patch="/tmp/guix-bootstrap-local-mes-extra.patch"
+    static_patch=""
 
     if [ ! -x "${guix_seed_helper}" ]; then
         echo "Missing Guix seed helper: ${guix_seed_helper}" >&2
@@ -160,8 +161,10 @@ prepare_local_channel_checkout() {
     fi
 
     (
-        cd "${channel_repo}"
-        patch -p1 < "${guix_patch_dir}/enforce-local-bootstrap-binaries-except-linux-headers.patch"
+        cd "${src_dir}"
+        for static_patch in "${guix_patch_dir}"/*.patch; do
+            patch -d.. -Np0 < "${static_patch}"
+        done
         patch -p1 < "${rendered_patch}"
         patch -p1 < "${rendered_mes_patch}"
         git init -q
@@ -263,10 +266,10 @@ if [ -z "${src_dir}" ]; then
     exit 1
 fi
 
-mv "${src_dir}" "${channel_repo}"
-
 prepare_local_channel_checkout
 
+mv "${src_dir}" "${channel_repo}"
+
 channel_commit="$(git -C "${channel_repo}" rev-parse HEAD)"
 channel_branch="$(git -C "${channel_repo}" symbolic-ref --quiet --short HEAD)"
 if [ -z "${channel_branch}" ]; then