me
/
guix
Archived
1
0
Fork 0
Code

gnu: graphviz: Turn arguments into a gexp. 

* gnu/packages/graphviz.scm (graphviz)[arguments]: Use a gexp for the
modify-phases block.  Remove trailing #t's while at it.
master
Marius Bakke 2021-07-23 17:11:55 +02:00
parent 9141483dee
commit 8561fdc85b
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
gnu/packages/graphviz.scm
View File

@ -33,6 +33,7 @@
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix git-download) #:use-module (guix git-download)
#:use-module (guix utils) #:use-module (guix utils)
#:use-module (guix gexp)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages autotools) #:use-module (gnu packages autotools)
#:use-module (gnu packages bison) #:use-module (gnu packages bison)
@ -74,29 +75,27 @@
(build-system gnu-build-system) (build-system gnu-build-system)
(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 (list #:tests? #f
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'install 'move-docs (add-after '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))) (add-after 'move-docs 'move-guile-bindings
(add-after '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")) (extdir (string-append lib
(extdir (string-append lib "/guile/2.0/extensions")))
"/guile/2.0/extensions"))) (mkdir-p extdir)
(mkdir-p extdir) (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"))
#t))))))
(inputs (inputs
`(("libXrender" ,libxrender) `(("libXrender" ,libxrender)
("libX11" ,libx11) ("libX11" ,libx11)