From aa72935a6f7f80f71fddce7933317d6c6c06fa0c Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Sun, 8 Mar 2026 19:37:19 -0400
Subject: [PATCH] fix(guix): set FHS local state path for daemon socket

---
 steps-guix/guix-1.5.0/pass1.sh             | 2 ++
 steps-guix/improve/guix-build-iso.sh       | 4 +++-
 steps-guix/improve/guix-daemon-and-pull.sh | 6 ++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/steps-guix/guix-1.5.0/pass1.sh b/steps-guix/guix-1.5.0/pass1.sh
index 1f84a27c..05c49a7e 100755
--- a/steps-guix/guix-1.5.0/pass1.sh
+++ b/steps-guix/guix-1.5.0/pass1.sh
@@ -205,6 +205,8 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        --sysconfdir=/etc \
+        --localstatedir=/var \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/improve/guix-build-iso.sh b/steps-guix/improve/guix-build-iso.sh
index 2d6adc1c..640de8d4 100644
--- a/steps-guix/improve/guix-build-iso.sh
+++ b/steps-guix/improve/guix-build-iso.sh
@@ -6,8 +6,10 @@ set -e
 . /steps/bootstrap.cfg
 . /steps/env
 
-daemon_socket="/var/guix/daemon-socket/socket"
+guix_localstate_dir="/var/guix"
+daemon_socket="${guix_localstate_dir}/daemon-socket/socket"
 out_dir="/external/guix-images"
+export GUIX_DAEMON_SOCKET="${daemon_socket}"
 
 if [ ! -S "${daemon_socket}" ]; then
     echo "guix-daemon socket is missing: ${daemon_socket}" >&2
diff --git a/steps-guix/improve/guix-daemon-and-pull.sh b/steps-guix/improve/guix-daemon-and-pull.sh
index 485fb711..3275bf3f 100644
--- a/steps-guix/improve/guix-daemon-and-pull.sh
+++ b/steps-guix/improve/guix-daemon-and-pull.sh
@@ -6,13 +6,15 @@ set -e
 . /steps/bootstrap.cfg
 . /steps/env
 
-daemon_socket="/var/guix/daemon-socket/socket"
+guix_localstate_dir="/var/guix"
+daemon_socket="${guix_localstate_dir}/daemon-socket/socket"
 channel_root="/var/lib/guix/local-channels"
 channel_repo="${channel_root}/guix"
 channel_work="/tmp/guix-local-channel-work"
 channels_file="/root/.config/guix/channels.scm"
 distfiles="${DISTFILES:-/external/distfiles}"
 PATH="/usr/sbin:/sbin:${PATH}"
+export GUIX_DAEMON_SOCKET="${daemon_socket}"
 
 have_group() {
     if command -v getent >/dev/null 2>&1; then
@@ -30,7 +32,7 @@ have_user() {
     fi
 }
 
-mkdir -p /proc /sys /dev /var/guix/daemon-socket /var/lib/guix /root/.config/guix
+mkdir -p /proc /sys /dev "${guix_localstate_dir}/daemon-socket" /var/lib/guix /root/.config/guix
 mount | grep ' on /proc ' >/dev/null 2>&1 || mount -t proc proc /proc
 mount | grep ' on /sys ' >/dev/null 2>&1 || mount -t sysfs sysfs /sys
 mount | grep ' on /dev ' >/dev/null 2>&1 || mount -t devtmpfs devtmpfs /dev