summary refs log tree commit diff
path: root/gnu
diff options
context:
space:
mode:
authorAndreas Enge <andreas@enge.fr>2015-09-04 21:43:40 +0200
committerAndreas Enge <andreas@enge.fr>2015-09-05 17:58:53 +0200
commit1de0afd5a5f6e1603df414909a3d9c35689aa94e (patch)
treeb39e3927898c941c9e80714f3ba343cb39c1b2e8 /gnu
parent45468e364987ba113fcef20e94d621b8dfc8f33f (diff)
downloadguix-1de0afd5a5f6e1603df414909a3d9c35689aa94e.tar.gz
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.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/image.scm8
1 files changed, 1 insertions, 7 deletions
diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index d2de92586f..393d9cf5f2 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