02/02: gnu: libtiff: Build with the current libjpeg instead of libjpeg-8.

[Andreas Enge]

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

commit 1de0afd5a5f6e1603df414909a3d9c35689aa94e
Author: Andreas Enge <address@hidden>
Date:   Fri Sep 4 21:43:40 2015 +0200

    gnu: libtiff: Build with the current libjpeg instead of libjpeg-8.
    
    * gnu/packages/image.scm (libtiff)[inputs]: Use libjpeg instead of 
libjpeg-9.
      [arguments]: Drop the now unneeded field.
---
 gnu/packages/image.scm |    8 +-------
 1 files changed, 1 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index d2de925..393d9cf 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -115,13 +115,7 @@ image files in PBMPLUS PPM/PGM, GIF, BMP, and Targa file 
formats.")
                      "171hgy4mylwmvdm7gp6ffjva81m4j56v3fbqsbfl7avzxn1slpp2"))))
    (build-system gnu-build-system)
    (inputs `(("zlib" ,zlib)
-             ("libjpeg-8" ,libjpeg-8)))
-             ;; currently does not compile with libjpeg version 9
-   (arguments
-    `(#:configure-flags
-      (list (string-append "--with-jpeg-include-dir="
-                           (assoc-ref %build-inputs "libjpeg-8")
-                           "/include"))))
+             ("libjpeg" ,libjpeg)))
    (synopsis "Library for handling TIFF files")
    (description
     "Libtiff provides support for the Tag Image File Format (TIFF), a format