From b3ec2a0d37b6494b04f38e20fc7ce450afb36d1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Sat, 28 Oct 2023 00:09:55 +0200
Subject: [PATCH] =?UTF-8?q?environment:=20Honor=20=E2=80=98-s=E2=80=99=20f?=
 =?UTF-8?q?or=20guile-for-build.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Partly fixes <https://issues.guix.gnu.org/65225>.

* guix/scripts/environment.scm (guix-environment*): Pass SYSTEM to
‘package-derivation’ when defining ‘%guile-for-build’.

Reported-by: Simon Tournier <zimon.toutoune@gmail.com>
Change-Id: I9d883f1e61fac72754fdc9dee9b7c8a3dea32add
---
 guix/scripts/environment.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/environment.scm b/guix/scripts/environment.scm
index 9712389842..61ef639b46 100644
--- a/guix/scripts/environment.scm
+++ b/guix/scripts/environment.scm
@@ -1153,7 +1153,8 @@ (define manifest
                               store
                               (if bootstrap?
                                   %bootstrap-guile
-                                  (default-guile))))))
+                                  (default-guile))
+                              system))))
           (run-with-store store
             ;; Containers need a Bourne shell at /bin/sh.
             (mlet* %store-monad ((bash       (environment-bash container?