futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu: graphviz: Use modify-phases.

Browse Source 
* gnu/packages/graphviz.scm (graphviz): Re-indent.
[arguments]: Use modify-phases instead of alist-cons-before and
alist-cons-after.
Return #t from move-guile-bindings phase.
This commit is contained in:
Arun Isaac 2017-07-12 19:55:54 +05:30
parent 78a81e37cd
commit 2170cc76d4
No known key found for this signature in database
GPG Key ID: 2E25EE8B61802BB3
1 changed files with 37 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
gnu/packages/graphviz.scm
View File

@ -57,27 +57,25 @@
(arguments
;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input.
'(#:tests? #f
#:phases (alist-cons-before
'build 'pre-build
#:phases
(modify-phases %standard-phases
(add-before 'build 'pre-build
(lambda _
;; Work around bogus makefile when using an external
;; libltdl. Failing to do so, one hits this error:
;; "No rule to make target `-lltdl', needed by `libgvc.la'."
(substitute* "lib/gvc/Makefile"
(("am__append_5 *=.*")
"am_append_5 =\n")))
(alist-cons-after
'install 'move-docs
"am_append_5 =\n"))))
(add-after 'install 'move-docs
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out"))
(doc (assoc-ref outputs "doc")))
(mkdir-p (string-append doc "/share/graphviz"))
(rename-file (string-append out "/share/graphviz/doc")
(string-append doc "/share/graphviz/doc"))
#t))
(alist-cons-after
'move-docs 'move-guile-bindings
#t)))
(add-after 'move-docs 'move-guile-bindings
(lambda* (#:key outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(lib (string-append out "/lib"))
@ -87,8 +85,8 @@
(rename-file (string-append
lib "/graphviz/guile/libgv_guile.so")
(string-append extdir
"/libgv_guile.so"))))
%standard-phases)))))
"/libgv_guile.so"))
#t))))))
(inputs
`(("libXrender" ,libxrender)
("libX11" ,libx11)