summary refs log tree commit diff
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2017-02-23 13:48:11 -0500
committerLeo Famulari <leo@famulari.name>2017-02-23 14:27:35 -0500
commit9f05908fb1e3707cae593d94688748294717a546 (patch)
treeb824c7456f590318c9d3544e5dddd16c620f9627
parentb191f0a6c50f2a7d47037ef8509d0351f5a2646e (diff)
downloadguix-9f05908fb1e3707cae593d94688748294717a546.tar.gz
download: Provide a fall-back guile for older daemons.
Fixes <http://bugs.gnu.org/25775>.

* guix/download.scm (in-band-download): Use %bootstrap-guile as a
fall-back when using older daemons that do not have a built-in
downloader.

Written-by: Ricardo Wurmus <rekado@elephly.net>
-rw-r--r--guix/download.scm5
1 files changed, 4 insertions, 1 deletions
diff --git a/guix/download.scm b/guix/download.scm
index 813f51f489..86f8598812 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -418,7 +418,10 @@ GnuTLS itself and its dependencies.  See <http://bugs.gnu.org/22774>."
                        ;; hash of the expected result.
                        #:verify-certificate? #f)))))
 
-  (mlet %store-monad ((guile (package->derivation guile system)))
+  (mlet %store-monad ((guile (package->derivation
+                              (or guile
+                                  (@@ (gnu packages bootstrap) %bootstrap-guile))
+                              system)))
     (gexp->derivation file-name builder
                       #:guile-for-build guile
                       #:system system