nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2018-10-10 11:49:47 +02:00
parent a50f5258c7
commit 296ad59216
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/guile.scm
View File

@ -1192,13 +1192,15 @@ Guile's foreign function interface.")
#:tests? #f ; test suite is non-deterministic :( #:tests? #f ; test suite is non-deterministic :(
#:phases (modify-phases %standard-phases #:phases (modify-phases %standard-phases
(add-after 'install 'wrap-haunt (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 ;; Wrap the 'haunt' command to refer to the right
;; modules. ;; modules.
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin")) (bin (string-append out "/bin"))
(site (string-append (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) (match (scandir site)
(("." ".." version) (("." ".." version)
(let ((modules (string-append site "/" version)) (let ((modules (string-append site "/" version))
@ -1207,9 +1209,19 @@ Guile's foreign function interface.")
"/site-ccache"))) "/site-ccache")))
(wrap-program (string-append bin "/haunt") (wrap-program (string-append bin "/haunt")
`("GUILE_LOAD_PATH" ":" prefix `("GUILE_LOAD_PATH" ":" prefix
(,modules)) (,modules
,@(map (lambda (dep)
(string-append dep
"/share/guile/site/"
version))
deps)))
`("GUILE_LOAD_COMPILED_PATH" ":" prefix `("GUILE_LOAD_COMPILED_PATH" ":" prefix
(,compiled-modules))) (,compiled-modules
,@(map (lambda (dep)
(string-append dep "/lib/guile/"
version
"/site-ccache"))
deps))))
#t))))))))) #t)))))))))
(native-inputs (native-inputs
`(("pkg-config" ,pkg-config) `(("pkg-config" ,pkg-config)