diff options
author | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-11-29 18:47:16 +0100 |
---|---|---|
committer | Hartmut Goebel <h.goebel@crazy-compilers.com> | 2016-11-29 18:47:16 +0100 |
commit | 3bf428065916f1a47c5ed12f5622f0eff4123644 (patch) | |
tree | f424c57b8a00a019e04fc29f42c8527a811ba281 /build-aux | |
parent | 2cb64f3b1b3df338acfc0ba9f719875db21812b0 (diff) | |
parent | 683c5ab70accb909697717bb61741a7692c52c09 (diff) | |
download | patches-3bf428065916f1a47c5ed12f5622f0eff4123644.tar patches-3bf428065916f1a47c5ed12f5622f0eff4123644.tar.gz |
Merge branch 'master' into python-build-system
Diffstat (limited to 'build-aux')
-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 |