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.

1 files changed, 8 insertions, 1 deletions

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index d8f3ff9bb0..edb7f5d9c5 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -297,8 +297,15 @@ person's version identifier."
 ;; The procedure below is our return value.
 (define* (build source
                 #:key verbose? (version (date-version-string)) system
-                (guile-version (effective-version))
                 (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
                 #:rest rest)
   "Return a derivation that unpacks SOURCE into STORE and compiles Scheme