From 347e17b47450a0fcc120c29e8b307e87b9182c21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Thu, 16 Oct 2014 23:39:54 +0200
Subject: [PATCH] download: Allow use of substitutes.
See <https://bugs.gnu.org/18747> for the original report.
* guix/download.scm (url-fetch): Comment out #:local-build? argument.
* guix/git-download.scm (git-fetch): Likewise.
* guix/svn-download.scm (svn-fetch): Likewise.
---
guix/download.scm | 6 +++++-
guix/git-download.scm | 3 ++-
guix/svn-download.scm | 3 ++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/guix/download.scm b/guix/download.scm
index 2d4bf749518..4f16c3a900e 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -258,7 +258,11 @@ (define builder
#:guile-for-build guile-for-build
;; In general, offloading downloads is not a good idea.
- #:local-build? #t)
+ ;;#:local-build? #t
+ ;; FIXME: The above would also disable use of
+ ;; substitutes, so comment it out; see
+ ;; <https://bugs.gnu.org/18747>.
+ )
#:guile-for-build guile-for-build
#:system system))))
diff --git a/guix/git-download.scm b/guix/git-download.scm
index b88339bed3e..94b118a7b9a 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -98,7 +98,8 @@ (define build
(run-with-store store
(gexp->derivation (or name "git-checkout") build
#:system system
- #:local-build? #t
+ ;; FIXME: See <https://bugs.gnu.org/18747>.
+ ;;#:local-build? #t
#:hash-algo hash-algo
#:hash hash
#:recursive? #t
diff --git a/guix/svn-download.scm b/guix/svn-download.scm
index 31dd1a90e83..f06e4497777 100644
--- a/guix/svn-download.scm
+++ b/guix/svn-download.scm
@@ -76,7 +76,8 @@ (define build
(run-with-store store
(gexp->derivation (or name "svn-checkout") build
#:system system
- #:local-build? #t
+ ;; FIXME: See <https://bugs.gnu.org/18747>.
+ ;;#:local-build? #t
#:hash-algo hash-algo
#:hash hash
#:recursive? #t
--
GitLab