aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/pdf.scm
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2016-11-30 18:31:37 +0100
committerMarius Bakke <mbakke@fastmail.com>2016-11-30 18:31:37 +0100
commitbc118f1a0367036128a6acfdc9fe34c8554009ac (patch)
tree28fbbeb9cfccb13269d3c6b70b3b0cc314583db9 /gnu/packages/pdf.scm
parent8b6aee5f82461f43a3ff4f12ccb84ae87413b112 (diff)
downloadguix-bc118f1a0367036128a6acfdc9fe34c8554009ac.tar
guix-bc118f1a0367036128a6acfdc9fe34c8554009ac.tar.gz
gnu: cairo: Eliminate graft.
* gnu/packages/gtk.scm (cairo)[replacement]: Remove field. [source]: Add patch from 'cairo/fixed'. (cairo-xcb)[source]: Inherit from cairo. [replacement]: Remove field. (cairo/fixed): Remove variable. * gnu/packages/pdf.scm (poppler)[inputs]: Remove cairo replacement.
Diffstat (limited to 'gnu/packages/pdf.scm')
-rw-r--r--gnu/packages/pdf.scm11
1 files changed, 0 insertions, 11 deletions
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index b95fe5e0cf..d491642e49 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -95,17 +95,6 @@
;; 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)
- (replacement
- (package
- (inherit cairo)
- (replacement #f)
- (source
- (origin
- (inherit (package-source cairo))
- (patches (search-patches
- "cairo-CVE-2016-9082.patch"))))
- (inputs (alist-delete "poppler"
- (package-inputs cairo)))))
(inputs (alist-delete "poppler"
(package-inputs cairo)))))
("glib" ,glib)))