diff --git a/guix/self.scm b/guix/self.scm index 126116e08a..ecf846490f 100644 --- a/guix/self.scm +++ b/guix/self.scm @@ -911,7 +911,11 @@ (define (shorten version) version)) (define guile - (guile-for-build guile-version)) + ;; When PULL-VERSION >= 1, produce a self-contained Guix and use Guile 2.2 + ;; unconditionally. + (guile-for-build (if (>= pull-version 1) + "2.2" + guile-version))) (mbegin %store-monad (set-guile-for-build guile) @@ -920,9 +924,11 @@ (define guile #:name (string-append "guix-" (shorten version)) #:pull-version pull-version - #:guile-version (match guile-version - ("2.2.2" "2.2") - (version version)) + #:guile-version (if (>= pull-version 1) + "2.2" + (match guile-version + ("2.2.2" "2.2") + (version version))) #:guile-for-build guile))) (if guix (lower-object guix)