ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-07 07:26:13 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pull: Add guile-ssh to the dependencies.

Browse source 
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.
This commit is contained in:
宋文武 2016-11-26 21:44:37 +08:00
parent faa29e4bdb
commit 5aed7f10f3
No known key found for this signature in database
GPG key ID: 26525665AE727D37
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build-aux/build-self.scm
View file

@ -61,6 +61,8 @@ (define xz
(define guile-json (define guile-json
(first (find-best-packages-by-name "guile-json" #f))) (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. ;; The actual build procedure.
@ -103,8 +105,14 @@ (define builder
(use-modules (guix build pull)) (use-modules (guix build pull))
(let ((json (string-append #$guile-json "/share/guile/site/2.0"))) (let ((json (string-append #$guile-json "/share/guile/site/2.0")))
(set! %load-path (cons json %load-path)) (set! %load-path
(set! %load-compiled-path (cons json %load-compiled-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 (build-guix #$output #$source