[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
03/06: gnu: poppler: Use new input style.
From: |
guix-commits |
Subject: |
03/06: gnu: poppler: Use new input style. |
Date: |
Sat, 5 Feb 2022 18:57:39 -0500 (EST) |
lilyp pushed a commit to branch core-updates
in repository guix.
commit d5f8bfcd14b29bc795a1bc7a18fcbcb5276d4df2
Author: Liliana Marie Prikler <liliana.prikler@gmail.com>
AuthorDate: Sun Feb 6 00:14:59 2022 +0100
gnu: poppler: Use new input style.
* gnu/packages/pdf.scm (poppler)[inputs]: Drop labels.
---
gnu/packages/pdf.scm | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index d1c672f7dc..a7eaea991c 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -235,19 +235,18 @@ please install the @code{flyer-composer-gui} package.")))
(build-system cmake-build-system)
;; FIXME:
;; use libcurl: no
- (inputs `(("fontconfig" ,fontconfig)
- ("freetype" ,freetype)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libtiff" ,libtiff)
- ("lcms" ,lcms)
- ("openjpeg" ,openjpeg)
- ("poppler-data", poppler-data)
- ("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" ,cairo-sans-poppler)))
+ (inputs (list fontconfig
+ freetype
+ libjpeg-turbo
+ libpng
+ libtiff
+ lcms
+ openjpeg
+ poppler-data
+ 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-sans-poppler))
(propagated-inputs
;; As per poppler-cairo and poppler-glib.pc.
;; XXX: Ideally we'd propagate Cairo too, but that would require a
- branch core-updates updated (6ac6a7e020 -> 10ee2542e8), guix-commits, 2022/02/05
- 01/06: gnu: poppler: Add poppler-data., guix-commits, 2022/02/05
- 02/06: gnu: pdf2djvu: Remove poppler-data., guix-commits, 2022/02/05
- 03/06: gnu: poppler: Use new input style.,
guix-commits <=
- 06/06: gnu: poppler: Enable tests., guix-commits, 2022/02/05
- 04/06: gnu: poppler: Use gexps in arguments., guix-commits, 2022/02/05
- 05/06: gnu: poppler: Update to 22.01.0., guix-commits, 2022/02/05