aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-10-13 22:49:23 +0200
committerLudovic Courtès <ludo@gnu.org>2013-10-13 22:50:11 +0200
commit8db824ba3102b6941d3fbf32ec2f5e598c71422d (patch)
treecdc7f673795ab2e21c1354d7c5b73d9bbedf1e9c /gnu/packages
parentcc20a22a09bc1fa6969040e39cbc588a17bc62be (diff)
downloadguix-8db824ba3102b6941d3fbf32ec2f5e598c71422d.tar
guix-8db824ba3102b6941d3fbf32ec2f5e598c71422d.tar.gz
gnu: poppler: Build the poppler-glib bindings.
* gnu/packages/pdf.scm (poppler): Add Cairo and GLib as inputs.
Diffstat (limited to 'gnu/packages')
-rw-r--r--gnu/packages/pdf.scm15
1 files changed, 12 insertions, 3 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 2dd3c9e32c..701eb586eb 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -31,7 +31,10 @@
#:use-module (gnu packages libpng)
#:use-module (gnu packages libtiff)
#:use-module (gnu packages pkg-config)
- #:use-module (gnu packages xorg))
+ #:use-module (gnu packages xorg)
+ #:use-module (gnu packages glib)
+ #:use-module (gnu packages gtk)
+ #:use-module (srfi srfi-1))
(define-public poppler
(package
@@ -47,7 +50,6 @@
;; FIXME: more dependencies could be added
;; cairo output: no (requires cairo >= 1.10.0)
;; qt4 wrapper: no
- ;; glib wrapper: no (requires cairo output)
;; introspection: no
;; use gtk-doc: no
;; use libcurl: no
@@ -58,7 +60,14 @@
("libpng" ,libpng)
("libtiff" ,libtiff)
("pkg-config" ,pkg-config)
- ("zlib" ,zlib)))
+ ("zlib" ,zlib)
+
+ ;; To build poppler-glib (as needed by Evince), we need Cairo and
+ ;; GLib. But of course, that Cairo must not depend on Poppler.
+ ("cairo" ,(package (inherit cairo)
+ (inputs (alist-delete "poppler"
+ (package-inputs cairo)))))
+ ("glib" ,glib)))
(arguments
`(#:tests? #f ; no test data provided with the tarball
#:configure-flags