diff options
| author | Marius Bakke <marius@gnu.org> | 2021-07-23 17:11:55 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-07-23 17:26:46 +0200 |
| commit | 8561fdc85b1342299251b107bc356f4b3e295719 (patch) | |
| tree | c6413051c943c16d69ceba27ca39968d07a670cc | |
| parent | 9141483deef0afaa8cc5f7457290927068709ee7 (diff) | |
| download | guix-8561fdc85b1342299251b107bc356f4b3e295719.tar.gz | |
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.
| -rw-r--r-- | gnu/packages/graphviz.scm | 45 |
1 files changed, 22 insertions, 23 deletions
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 34d6434f60..70b511c227 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -33,6 +33,7 @@ #:use-module (guix download) #:use-module (guix git-download) #:use-module (guix utils) + #:use-module (guix gexp) #:use-module (gnu packages) #:use-module (gnu packages autotools) #:use-module (gnu packages bison) @@ -74,29 +75,27 @@ (build-system gnu-build-system) (arguments ;; FIXME: rtest/rtest.sh is a ksh script (!). Add ksh as an input. - '(#:tests? #f - #:phases - (modify-phases %standard-phases - (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))) - (add-after 'move-docs 'move-guile-bindings - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (lib (string-append out "/lib")) - (extdir (string-append lib - "/guile/2.0/extensions"))) - (mkdir-p extdir) - (rename-file (string-append - lib "/graphviz/guile/libgv_guile.so") - (string-append extdir - "/libgv_guile.so")) - #t)))))) + (list #:tests? #f + #:phases + #~(modify-phases %standard-phases + (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"))))) + (add-after 'move-docs 'move-guile-bindings + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (lib (string-append out "/lib")) + (extdir (string-append lib + "/guile/2.0/extensions"))) + (mkdir-p extdir) + (rename-file (string-append + lib "/graphviz/guile/libgv_guile.so") + (string-append extdir + "/libgv_guile.so")))))))) (inputs `(("libXrender" ,libxrender) ("libX11" ,libx11) |