diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-01 12:59:31 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-01 12:59:31 +0100 |
| commit | ff8061b59161592690ab6ea526282fae11d87676 (patch) | |
| tree | 09f00df03ec0a1f4922376ba1a0cd4f443a305e4 /gnu/packages/pdf.scm | |
| parent | e50805251ae7386c2ddbd036885bcc4300cf336e (diff) | |
| parent | b645425f71a5a777e7658bbdac0e22e134d44db5 (diff) | |
| download | guix-ff8061b59161592690ab6ea526282fae11d87676.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/pdf.scm')
| -rw-r--r-- | gnu/packages/pdf.scm | 15 |
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 |