01/01: gnu: poppler: Build against address@hidden

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 301804d67481a25ed81862796df50af88443603f
Author: Marius Bakke <address@hidden>
Date:   Sun Dec 10 16:46:15 2017 +0100

    gnu: poppler: Build against address@hidden
    
    * gnu/packages/pdf.scm (poppler)[inputs]: Change OPENJPEG-1 to OPENJPEG.
    [arguments]<#:phases>: Remove.
---
 gnu/packages/pdf.scm | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm
index 84b9261..c515715 100644
--- a/gnu/packages/pdf.scm
+++ b/gnu/packages/pdf.scm
@@ -94,7 +94,7 @@
              ("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 @@
         "--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.")