aboutsummaryrefslogtreecommitdiff
path: root/build-aux
diff options
context:
space:
mode:
author宋文武 <iyzsong@member.fsf.org>2016-11-26 21:44:37 +0800
committer宋文武 <iyzsong@member.fsf.org>2016-11-26 22:03:23 +0800
commit5aed7f10f322e93407b925293e72bcefdbc79599 (patch)
tree76aeab78cccab8ec89be118bb861aa0d11f11578 /build-aux
parentfaa29e4bdb44ff609b73fe0b38ef44322840a876 (diff)
downloadguix-5aed7f10f322e93407b925293e72bcefdbc79599.tar
guix-5aed7f10f322e93407b925293e72bcefdbc79599.tar.gz
pull: Add guile-ssh to the dependencies.
Fix regression introduced in 9e76eed. * build-aux/build-self.scm (guile-ssh): New variable. (build)[builder]: Add 'guile-ssh' to %load-path and %load-compiled-path.
Diffstat (limited to 'build-aux')
-rw-r--r--build-aux/build-self.scm12
1 files changed, 10 insertions, 2 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 59028305e7..485f91b4c0 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -61,6 +61,8 @@
(define guile-json
(first (find-best-packages-by-name "guile-json" #f)))
+(define guile-ssh
+ (first (find-best-packages-by-name "guile-ssh" #f)))
;; The actual build procedure.
@@ -103,8 +105,14 @@ files."
(use-modules (guix build pull))
(let ((json (string-append #$guile-json "/share/guile/site/2.0")))
- (set! %load-path (cons json %load-path))
- (set! %load-compiled-path (cons json %load-compiled-path)))
+ (set! %load-path
+ (cons* json
+ (string-append #$guile-ssh "/share/guile/site/2.0")
+ %load-path))
+ (set! %load-compiled-path
+ (cons* json
+ (string-append #$guile-ssh "/lib/guile/2.0/site-ccache")
+ %load-compiled-path)))
(build-guix #$output #$source