aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-02-22 20:01:29 +0100
committerLudovic Courtès <ludo@gnu.org>2013-02-27 20:55:42 +0100
commita1c14677564b90a67eec5865dd63345a35cafd42 (patch)
tree7c633730ab521cf3103ac568b3cb5487cfa1ea4d
parent00fa3d1457ad466d1742fb74baf2760282cb41b0 (diff)
downloadpatches-a1c14677564b90a67eec5865dd63345a35cafd42.tar
patches-a1c14677564b90a67eec5865dd63345a35cafd42.tar.gz
pull: Build (guix build download) first, because of the (gnutls) autoload.
* guix/scripts/pull.scm (unpack): Build (guix build download) first, as done in 855a8ad71def2ebc594ed32c57bda0ca4e13d91c. Reported by Andreas Enge <andreas@enge.fr>.
-rw-r--r--guix/scripts/pull.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/scripts/pull.scm b/guix/scripts/pull.scm
index f12133fff7..42ff525524 100644
--- a/guix/scripts/pull.scm
+++ b/guix/scripts/pull.scm
@@ -123,7 +123,12 @@ files."
(compile-file file
#:output-file go
#:opts %auto-compilation-options))))
- (find-files out "\\.scm"))
+
+ ;; XXX: Because of the autoload hack in (guix build
+ ;; download), we must build it first to avoid errors since
+ ;; (gnutls) is unavailable.
+ (cons (string-append out "/guix/build/download.scm")
+ (find-files out "\\.scm")))
;; Remove the "fake" (guix config).
(delete-file (string-append out "/guix/config.scm"))