[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/04: gnu: haunt: Make sure Guile-CommonMark and Guile-Reader are alway
From: |
Ludovic Courtès |
Subject: |
01/04: gnu: haunt: Make sure Guile-CommonMark and Guile-Reader are always visible. |
Date: |
Wed, 10 Oct 2018 08:58:05 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 296ad592166841c3b6762bc4e9114d12451498cf
Author: Ludovic Courtès <address@hidden>
Date: Wed Oct 10 11:49:47 2018 +0200
gnu: haunt: Make sure Guile-CommonMark and Guile-Reader are always visible.
* gnu/packages/guile.scm (haunt)[arguments]: In 'wrap-haunt' phase, add
Guile-Reader and Guile-CommonMark to the search paths.
---
gnu/packages/guile.scm | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 1d33066..f7baff4 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -1192,13 +1192,15 @@ Guile's foreign function interface.")
#:tests? #f ; test suite is non-deterministic :(
#:phases (modify-phases %standard-phases
(add-after 'install 'wrap-haunt
- (lambda* (#:key outputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
;; Wrap the 'haunt' command to refer to the right
;; modules.
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin"))
(site (string-append
- out "/share/guile/site")))
+ out "/share/guile/site"))
+ (deps (list (assoc-ref inputs "guile-reader")
+ (assoc-ref inputs
"guile-commonmark"))))
(match (scandir site)
(("." ".." version)
(let ((modules (string-append site "/" version))
@@ -1207,9 +1209,19 @@ Guile's foreign function interface.")
"/site-ccache")))
(wrap-program (string-append bin "/haunt")
`("GUILE_LOAD_PATH" ":" prefix
- (,modules))
+ (,modules
+ ,@(map (lambda (dep)
+ (string-append dep
+ "/share/guile/site/"
+ version))
+ deps)))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix
- (,compiled-modules)))
+ (,compiled-modules
+ ,@(map (lambda (dep)
+ (string-append dep "/lib/guile/"
+ version
+ "/site-ccache"))
+ deps))))
#t)))))))))
(native-inputs
`(("pkg-config" ,pkg-config)