aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMathieu Othacehe <m.othacehe@gmail.com>2017-06-07 13:44:47 +0200
committerMathieu Othacehe <m.othacehe@gmail.com>2017-06-09 09:48:26 +0200
commit19c90e5f697bbf1be5ea3a7b4f5fe712d77070a1 (patch)
tree6636b15bda638ba6c1ed3de258ff9a14dfc5e47f
parent6b7b3ca9813d00b734d1318e40e6c10d17859d12 (diff)
downloadguix-19c90e5f697bbf1be5ea3a7b4f5fe712d77070a1.tar
guix-19c90e5f697bbf1be5ea3a7b4f5fe712d77070a1.tar.gz
pull: Add a dependency to guile-git.
* build-aux/build-self.scm (guile-git, guile-bytestructures): New variables. (build): Add guile-git and guile-bytestructures to %load-path and %load-compiled-path.
-rw-r--r--build-aux/build-self.scm52
1 files changed, 41 insertions, 11 deletions
diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm
index a1335fea1d..8fb9af23ca 100644
--- a/build-aux/build-self.scm
+++ b/build-aux/build-self.scm
@@ -97,6 +97,13 @@ Guile major version (2.0 or 2.2), or #f if none of the packages matches."
"guile2.2-ssh"
"guile2.0-ssh"))
+(define guile-git
+ (package-for-current-guile "guile-git"
+ "guile2.0-git"))
+
+(define guile-bytestructures
+ (package-for-current-guile "guile-bytestructures"
+ "guile2.0-bytestructures"))
;; The actual build procedure.
@@ -148,19 +155,42 @@ files."
#~(begin
(use-modules (guix build pull))
- (let ((json (string-append #$guile-json "/share/guile/site/"
- #$(effective-version))))
+ (letrec-syntax ((maybe-load-path
+ (syntax-rules ()
+ ((_ item rest ...)
+ (let ((tail (maybe-load-path rest ...)))
+ (if (string? item)
+ (cons (string-append item
+ "/share/guile/site/"
+ #$(effective-version))
+ tail)
+ tail)))
+ ((_)
+ '()))))
(set! %load-path
- (cons* json
- (string-append #$guile-ssh "/share/guile/site/"
- #$(effective-version))
- %load-path))
+ (append
+ (maybe-load-path #$guile-json #$guile-ssh
+ #$guile-git #$guile-bytestructures)
+ %load-path)))
+
+ (letrec-syntax ((maybe-load-compiled-path
+ (syntax-rules ()
+ ((_ item rest ...)
+ (let ((tail (maybe-load-compiled-path rest ...)))
+ (if (string? item)
+ (cons (string-append item
+ "/lib/guile/"
+ #$(effective-version)
+ "/site-ccache")
+ tail)
+ tail)))
+ ((_)
+ '()))))
(set! %load-compiled-path
- (cons* json
- (string-append #$guile-ssh "/lib/guile/"
- #$(effective-version)
- "/site-ccache")
- %load-compiled-path)))
+ (append
+ (maybe-load-compiled-path #$guile-json #$guile-ssh
+ #$guile-git #$guile-bytestructures)
+ %load-compiled-path)))
;; XXX: The 'guile-ssh' package prior to Guix commit 92b7258 was
;; broken: libguile-ssh could not be found. Work around that.