nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

build-self: Default to Guile 2.2 when building a standalone Guix. 

* build-aux/build-self.scm (build): Change #:guile-version to default to
"2.2" when PULL-VERSION is greater than 0.
This commit is contained in:
Ludovic Courtès 2018-07-27 11:32:59 +02:00
parent 8bece84022
commit 1428bce348
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build-aux/build-self.scm
View File

@ -297,8 +297,15 @@ person's version identifier."
;; The procedure below is our return value. ;; The procedure below is our return value.
(define* (build source (define* (build source
#:key verbose? (version (date-version-string)) system #:key verbose? (version (date-version-string)) system
(guile-version (effective-version))
(pull-version 0) (pull-version 0)
;; For the standalone Guix, default to Guile 2.2. For old
;; versions of 'guix pull' (pre-0.15.0), we have to use the
;; same Guile as the current one.
(guile-version (if (> pull-version 0)
"2.2"
(effective-version)))
#:allow-other-keys #:allow-other-keys
#:rest rest) #:rest rest)
"Return a derivation that unpacks SOURCE into STORE and compiles Scheme "Return a derivation that unpacks SOURCE into STORE and compiles Scheme