guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/01: pull: Add guile-ssh to the dependencies.


From: ???
Subject: 01/01: pull: Add guile-ssh to the dependencies.
Date: Sat, 26 Nov 2016 14:05:47 +0000 (UTC)

iyzsong pushed a commit to branch master
in repository guix.

commit 5aed7f10f322e93407b925293e72bcefdbc79599
Author: 宋文武 <address@hidden>
Date:   Sat Nov 26 21:44:37 2016 +0800

    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.
---
 build-aux/build-self.scm |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index 5902830..485f91b 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
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]