From 87009d8aa1ffc03ee2b3a96d3acd078b868d12ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Tue, 8 Jan 2013 00:05:37 +0100
Subject: [PATCH] guix-package: Use `guile-final', not `guile-2.0' to build the
environment.
* guix-package.in (guix-package): Use either %BOOTSTRAP-GUILE or
GUILE-FINAL.
---
guix-package.in | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/guix-package.in b/guix-package.in
index c02f1c634e6..cf40cdc42dc 100644
--- a/guix-package.in
+++ b/guix-package.in
@@ -46,7 +46,8 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
#:use-module (srfi srfi-34)
#:use-module (srfi srfi-37)
#:use-module (distro)
- #:use-module (distro packages guile)
+ #:use-module ((distro packages base) #:select (guile-final))
+ #:use-module ((distro packages bootstrap) #:select (%bootstrap-guile))
#:export (guix-package))
(define %store
@@ -461,9 +462,8 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
(parameterize ((%guile-for-build
(package-derivation %store
(if (assoc-ref opts 'bootstrap?)
- (@@ (distro packages base)
- %bootstrap-guile)
- guile-2.0))))
+ %bootstrap-guile
+ guile-final))))
(process-actions opts))))))
;; Local Variables:
--
GitLab