diff options
author | Leo Famulari <leo@famulari.name> | 2016-05-13 02:03:22 -0400 |
---|---|---|
committer | Leo Famulari <leo@famulari.name> | 2016-05-13 02:08:11 -0400 |
commit | eb74eb4199db3faac654114257996f244ec308f5 (patch) | |
tree | 9504ae968710941557be6d1edd244618eeb14448 /gnu/packages/graphviz.scm | |
parent | f10e7ef475da430afa46e0b062010952ed886694 (diff) | |
parent | e9017c98d61f305b624bacaa30e8891ec0100980 (diff) | |
download | guix-eb74eb4199db3faac654114257996f244ec308f5.tar guix-eb74eb4199db3faac654114257996f244ec308f5.tar.gz |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/graphviz.scm')
-rw-r--r-- | gnu/packages/graphviz.scm | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/gnu/packages/graphviz.scm b/gnu/packages/graphviz.scm index 09f475bd90..e4b9094632 100644 --- a/gnu/packages/graphviz.scm +++ b/gnu/packages/graphviz.scm @@ -25,6 +25,7 @@ #:use-module (gnu packages gtk) #:use-module (gnu packages xml) #:use-module (gnu packages glib) + #:use-module (gnu packages guile) #:use-module (gnu packages bison) #:use-module (gnu packages image) #:use-module (gnu packages autotools) @@ -32,6 +33,7 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages compression) #:use-module (gnu packages gd) + #:use-module (gnu packages swig) #:use-module ((guix licenses) #:select (lgpl2.0+ epl1.0))) (define-public graphviz @@ -69,12 +71,26 @@ (rename-file (string-append out "/share/graphviz/doc") (string-append doc "/share/graphviz/doc")) #t)) - %standard-phases)))) + (alist-cons-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")))) + %standard-phases))))) (inputs `(("libXrender" ,libxrender) ("libX11" ,libx11) ("gts" ,gts) ("gd" ,gd) ; FIXME: Our GD is too old + ("guile" ,guile-2.0) ;Guile bindings + ("swig" ,swig) ("pango" ,pango) ("fontconfig" ,fontconfig) ("freetype" ,freetype) |