summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-01-08 00:05:37 +0100
committerLudovic Courtès <ludo@gnu.org>2013-01-08 00:05:37 +0100
commit87009d8aa1ffc03ee2b3a96d3acd078b868d12ce (patch)
tree91185be2f9055aa7a7bb7cc70543d91ccecf2528
parent9762706b900cda66a3caa3deea2f55432d6ac592 (diff)
downloadguix-87009d8aa1ffc03ee2b3a96d3acd078b868d12ce.tar.gz
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.
-rw-r--r--guix-package.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/guix-package.in b/guix-package.in
index c02f1c634e..cf40cdc42d 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: