diff options
| author | Marius Bakke <[email protected]> | 2016-11-30 18:24:32 +0100 |
|---|---|---|
| committer | Marius Bakke <[email protected]> | 2016-11-30 18:24:32 +0100 |
| commit | 8a7cbc882a75d7f9f1fe960552dea47acf347b0a (patch) | |
| tree | ded8c9116d357b38fd23b8c0cc312863fe68c9b5 /build-aux/build-self.scm | |
| parent | 3084a9908434e4e7123d2fd3881c798977abedb9 (diff) | |
| parent | 72f0c5ea3c0272a93436ad3c04a281d1237a9593 (diff) | |
Merge branch 'master' into staging
Diffstat (limited to 'build-aux/build-self.scm')
| -rw-r--r-- | build-aux/build-self.scm | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 59028305e7..cc702490df 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,21 @@ 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))) + + ;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was + ;; broken: libguile-ssh could not be found. Work around that. + ;; FIXME: We want Guile-SSH 0.10.2 or later anyway. + #$(if (string-prefix? "0.9." (package-version guile-ssh)) + #~(setenv "LTDL_LIBRARY_PATH" (string-append #$guile-ssh "/lib")) + #t) (build-guix #$output #$source |