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.
This commit is contained in:
parent
9762706b90
commit
87009d8aa1
|
@ -46,7 +46,8 @@ exec ${GUILE-@GUILE@} -L "@guilemoduledir@" -l "$0" \
|
||||||
#:use-module (srfi srfi-34)
|
#:use-module (srfi srfi-34)
|
||||||
#:use-module (srfi srfi-37)
|
#:use-module (srfi srfi-37)
|
||||||
#:use-module (distro)
|
#: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))
|
#:export (guix-package))
|
||||||
|
|
||||||
(define %store
|
(define %store
|
||||||
|
@ -461,9 +462,8 @@ Install, remove, or upgrade PACKAGES in a single transaction.\n"))
|
||||||
(parameterize ((%guile-for-build
|
(parameterize ((%guile-for-build
|
||||||
(package-derivation %store
|
(package-derivation %store
|
||||||
(if (assoc-ref opts 'bootstrap?)
|
(if (assoc-ref opts 'bootstrap?)
|
||||||
(@@ (distro packages base)
|
%bootstrap-guile
|
||||||
%bootstrap-guile)
|
guile-final))))
|
||||||
guile-2.0))))
|
|
||||||
(process-actions opts))))))
|
(process-actions opts))))))
|
||||||
|
|
||||||
;; Local Variables:
|
;; Local Variables:
|
||||||
|
|
Loading…
Reference in New Issue