From c4666a1e35986c43d5c4cd0292d44488ab8111c5 Mon Sep 17 00:00:00 2001
From: vxtls <187420201+vxtls@users.noreply.github.com>
Date: Fri, 6 Mar 2026 09:52:21 -0500
Subject: [PATCH] fix(guile-modules): pin guile package install dirs to target
 libdir

---
 steps-guix/guile-avahi-0.4.1/pass1.sh   | 3 +++
 steps-guix/guile-gcrypt-0.5.0/pass1.sh  | 3 +++
 steps-guix/guile-git-0.10.0/pass1.sh    | 1 +
 steps-guix/guile-json-4.7.3/pass1.sh    | 3 +++
 steps-guix/guile-lzlib-0.0.2/pass1.sh   | 3 +++
 steps-guix/guile-sqlite3-0.1.3/pass1.sh | 3 +++
 steps-guix/guile-zlib-0.2.2/pass1.sh    | 3 +++
 7 files changed, 19 insertions(+)

diff --git a/steps-guix/guile-avahi-0.4.1/pass1.sh b/steps-guix/guile-avahi-0.4.1/pass1.sh
index 46dfded3..580ea505 100755
--- a/steps-guix/guile-avahi-0.4.1/pass1.sh
+++ b/steps-guix/guile-avahi-0.4.1/pass1.sh
@@ -16,6 +16,9 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
+        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-gcrypt-0.5.0/pass1.sh b/steps-guix/guile-gcrypt-0.5.0/pass1.sh
index 6bddd648..71558dce 100644
--- a/steps-guix/guile-gcrypt-0.5.0/pass1.sh
+++ b/steps-guix/guile-gcrypt-0.5.0/pass1.sh
@@ -21,6 +21,9 @@ src_configure() {
     ../configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
+        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}" \
         --with-libgcrypt-prefix="${PREFIX}" \
diff --git a/steps-guix/guile-git-0.10.0/pass1.sh b/steps-guix/guile-git-0.10.0/pass1.sh
index 02590664..b57248eb 100755
--- a/steps-guix/guile-git-0.10.0/pass1.sh
+++ b/steps-guix/guile-git-0.10.0/pass1.sh
@@ -29,6 +29,7 @@ src_configure() {
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
         '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
         '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
diff --git a/steps-guix/guile-json-4.7.3/pass1.sh b/steps-guix/guile-json-4.7.3/pass1.sh
index ace38a62..4951408c 100755
--- a/steps-guix/guile-json-4.7.3/pass1.sh
+++ b/steps-guix/guile-json-4.7.3/pass1.sh
@@ -17,6 +17,9 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
+        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-lzlib-0.0.2/pass1.sh b/steps-guix/guile-lzlib-0.0.2/pass1.sh
index 0215e50f..1e47b641 100755
--- a/steps-guix/guile-lzlib-0.0.2/pass1.sh
+++ b/steps-guix/guile-lzlib-0.0.2/pass1.sh
@@ -17,6 +17,9 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
+        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-sqlite3-0.1.3/pass1.sh b/steps-guix/guile-sqlite3-0.1.3/pass1.sh
index 2b1c0537..30af276b 100755
--- a/steps-guix/guile-sqlite3-0.1.3/pass1.sh
+++ b/steps-guix/guile-sqlite3-0.1.3/pass1.sh
@@ -17,6 +17,9 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
+        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }
diff --git a/steps-guix/guile-zlib-0.2.2/pass1.sh b/steps-guix/guile-zlib-0.2.2/pass1.sh
index 0215e50f..1e47b641 100755
--- a/steps-guix/guile-zlib-0.2.2/pass1.sh
+++ b/steps-guix/guile-zlib-0.2.2/pass1.sh
@@ -17,6 +17,9 @@ src_configure() {
     ./configure \
         --prefix="${PREFIX}" \
         --libdir="${LIBDIR}" \
+        '--with-guile-site-dir=$(datarootdir)/guile/site/$(GUILE_EFFECTIVE_VERSION)' \
+        '--with-guile-site-ccache-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/site-ccache' \
+        '--with-guile-extension-dir=$(libdir)/guile/$(GUILE_EFFECTIVE_VERSION)/extensions' \
         --host="${host_triplet}" \
         --build="${host_triplet}"
 }