ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

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