me
/
guix
Archived
1
0
Fork 0
Code

gnu: poppler: Always use the same 'cairo-sans-poppler' variant. 

* gnu/packages/gtk.scm (cairo-sans-poppler): New variable.
* gnu/packages/pdf.scm (poppler)[inputs]: Use it instead of
locally-created variant.
master
Ludovic Courtès 2020-10-20 09:34:23 +02:00
parent 8db4ebb0cd
commit e21e0affd9
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gnu/packages/gtk.scm
View File

@ -173,6 +173,12 @@ affine transformation (scale, rotation, shear, etc.).")
(license license:lgpl2.1) ; or Mozilla Public License 1.1 (license license:lgpl2.1) ; or Mozilla Public License 1.1
(home-page "https://cairographics.org/"))) (home-page "https://cairographics.org/")))
(define-public cairo-sans-poppler
;; Variant used to break the dependency cycle between Poppler and Cairo.
(package/inherit cairo
(inputs (alist-delete "poppler" (package-inputs cairo)))
(properties `((hidden? . #t)))))
(define-public cairo-xcb (define-public cairo-xcb
(package (package
(inherit cairo) (inherit cairo)

4
gnu/packages/pdf.scm
View File

@ -191,9 +191,7 @@ please install the @code{flyer-composer-gui} package.")))
;; To build poppler-glib (as needed by Evince), we need Cairo and ;; To build poppler-glib (as needed by Evince), we need Cairo and
;; GLib. But of course, that Cairo must not depend on Poppler. ;; GLib. But of course, that Cairo must not depend on Poppler.
("cairo" ,(package (inherit cairo) ("cairo" ,cairo-sans-poppler)))
(inputs (alist-delete "poppler"
(package-inputs cairo)))))))
(propagated-inputs (propagated-inputs
;; As per poppler-cairo and poppler-glib.pc. ;; As per poppler-cairo and poppler-glib.pc.
;; XXX: Ideally we'd propagate Cairo too, but that would require a ;; XXX: Ideally we'd propagate Cairo too, but that would require a