gnu: poppler: Build against openjpeg@2.

* gnu/packages/pdf.scm (poppler)[inputs]: Change OPENJPEG-1 to OPENJPEG.
[arguments]<#:phases>: Remove.
This commit is contained in:
Marius Bakke 2017-12-10 16:46:15 +01:00
parent 78cd051eef
commit 301804d674
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA

View file

@ -94,7 +94,7 @@ (define-public poppler
("libpng" ,libpng)
("libtiff" ,libtiff)
("lcms" ,lcms)
("openjpeg-1" ,openjpeg-1) ; prefers openjpeg-1
("openjpeg" ,openjpeg)
("zlib" ,zlib)
;; To build poppler-glib (as needed by Evince), we need Cairo and
@ -114,16 +114,7 @@ (define-public poppler
"--enable-zlib"
;; Saves 8 MiB of .a files.
"--disable-static")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'setenv
(lambda _
(setenv "CPATH"
(string-append (assoc-ref %build-inputs "openjpeg-1")
"/include/openjpeg-1.5"
":" (or (getenv "CPATH") "")))
#t)))))
"--disable-static")))
(synopsis "PDF rendering library")
(description
"Poppler is a PDF rendering library based on the xpdf-3.0 code base.")