public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libtiff: major update to 4.*

Browse Source 
Also minor modification of ghostscript to work with it.
This commit is contained in:
Vladimír Čunát 2013-01-29 13:32:55 +01:00
parent 319b6f77ca
commit 570b0f8c54
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libtiff/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, zlib, libjpeg }: { stdenv, fetchurl, zlib, libjpeg }:
let version = "3.9.7"; in let version = "4.0.3"; in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "libtiff-${version}"; name = "libtiff-${version}";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
[ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz"
"http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz"
]; ];
sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm"; sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa";
}; };
propagatedBuildInputs = [ zlib libjpeg ]; propagatedBuildInputs = [ zlib libjpeg ];
@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
meta = { meta = {
description = "Library and utilities for working with the TIFF image file format"; description = "Library and utilities for working with the TIFF image file format";
homepage = http://www.libtiff.org/; homepage = http://www.remotesensing.org/libtiff/;
license = "bsd"; license = "bsd";
}; };
} }

2
pkgs/misc/ghostscript/default.nix
View File

@ -92,7 +92,7 @@ stdenv.mkDerivation rec {
makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
'' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure; '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure;
configureFlags = configureFlags = [ "--with-system-libtiff" ] ++
(if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++ (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
(if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]); (if cupsSupport then [ "--enable-cups" "--with-install-cups" ] else [ "--disable-cups" ]);