From a8749e87adccb39407a0727349b40539dddba417 Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Wed, 8 Apr 2026 16:43:27 -0400
Subject: [PATCH] fix(guix-iso): align local channel assets and x86_64
 bootstrap

---
 steps-guix/guix-1.5.0/patches/build-native-utils-earlier.patch | 2 +-
 steps-guix/improve/guix-build-iso.sh                           | 3 +++
 steps-guix/improve/guix-daemon-and-pull.sh                     | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/steps-guix/guix-1.5.0/patches/build-native-utils-earlier.patch b/steps-guix/guix-1.5.0/patches/build-native-utils-earlier.patch
index 29543f6f..e4f45341 100644
--- a/steps-guix/guix-1.5.0/patches/build-native-utils-earlier.patch
+++ b/steps-guix/guix-1.5.0/patches/build-native-utils-earlier.patch
@@ -16,7 +16,7 @@ index 852fa2d..2dfb6a3 100644
 +    (name name)
 +    (source (bootstrap-origin (package-source pkg)))
 +    (native-inputs (inputs))
-+    (supported-systems '("i686-linux"))
++    (supported-systems '("i686-linux" "x86_64-linux"))
 +    (inputs '())
 +    (propagated-inputs '())
      (arguments
diff --git a/steps-guix/improve/guix-build-iso.sh b/steps-guix/improve/guix-build-iso.sh
index 1cc92bf0..23fa649d 100644
--- a/steps-guix/improve/guix-build-iso.sh
+++ b/steps-guix/improve/guix-build-iso.sh
@@ -20,6 +20,9 @@ fi
 mkdir -p "${out_dir}"
 
 cp /var/guix/profiles/per-user/root/current-guix/manifest /usr/manifest
+test -d /usr/share/guile/site/3.0/gnu/installer/aux-files || \
+    cp -r /var/lib/guix/local-channels/guix/gnu/installer/aux-files \
+        /usr/share/guile/site/3.0/gnu/installer/
 
 guix system image \
     --system=x86_64-linux \
diff --git a/steps-guix/improve/guix-daemon-and-pull.sh b/steps-guix/improve/guix-daemon-and-pull.sh
index 782c66a2..2a01cad3 100644
--- a/steps-guix/improve/guix-daemon-and-pull.sh
+++ b/steps-guix/improve/guix-daemon-and-pull.sh
@@ -320,4 +320,4 @@ if ! guile -c '(use-modules (gnutls)) (if (module-variable (resolve-module (quot
 fi
 
 start_distfiles_http_server
-guix pull --bootstrap -c "${JOBS}" --no-substitutes --channels="${channels_file}" --disable-authentication
+guix pull --system=x86_64-linux --bootstrap -c "${JOBS}" --no-substitutes --channels="${channels_file}" --disable-authentication