summary refs log tree commit diff
path: root/build-aux/build-self.scm
diff options
context:
space:
mode:
authorLeo Famulari <leo@famulari.name>2016-11-26 16:21:47 -0500
committerLeo Famulari <leo@famulari.name>2016-11-26 16:21:47 -0500
commita282cdae107c8aec512b563f25dd411183ef2830 (patch)
tree3359e7101ba120cb6d2dbd156327edd727bcc01a /build-aux/build-self.scm
parent3ad8cb4163deee77882ee4bded83a548752b896f (diff)
parentcd65d600ac6e8701ef9c54f5d09a45cd6c149949 (diff)
downloadguix-a282cdae107c8aec512b563f25dd411183ef2830.tar.gz
Merge branch 'master' into core-updates
Diffstat (limited to 'build-aux/build-self.scm')
-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