diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-13 15:31:26 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-05-13 18:17:26 +0200 |
commit | f40c885a34ce7b2644e5d450566806da1a7ac6f5 (patch) | |
tree | a8fbcfd5ec789fd5f7ec8f4d06fef270f9a697dd /pkgs/development/libraries/libtiff/default.nix | |
parent | e7feb89158e0e4330d0221e1c48483a94ba5a6ce (diff) | |
download | nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.tar nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.tar.gz nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.tar.bz2 nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.tar.lz nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.tar.xz nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.tar.zst nixpkgs-f40c885a34ce7b2644e5d450566806da1a7ac6f5.zip |
libtiff: Update to 4.0.4beta
Diffstat (limited to 'pkgs/development/libraries/libtiff/default.nix')
-rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 7ed9794011c..739148cb9a6 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,12 +1,7 @@ -{ stdenv, fetchurl, fetchsvn, pkgconfig, zlib, libjpeg, xz }: +{ stdenv, fetchurl, pkgconfig, zlib, libjpeg, xz }: let - version = "4.0.3"; - patchDir = fetchsvn { - url = svn://svn.archlinux.org/packages/libtiff/trunk; - rev = "198247"; - sha256 = "0a47l0zkc1zz7wxg64cyjv9z1djdvfyxgmwd03znlsac4zijkcy4"; - }; + version = "4.0.4beta"; in stdenv.mkDerivation rec { name = "libtiff-${version}"; @@ -19,19 +14,6 @@ stdenv.mkDerivation rec { sha256 = "0wj8d1iwk9vnpax2h29xqc2hwknxg3s0ay2d5pxkg59ihbifn6pa"; }; - patchPhase = '' - for p in ${patchDir}/*-{2013-4244,2012-4447,2012-4564,2013-1960,2013-1961,libjpeg-turbo}.patch; do - patch -p1 < "$p" - done - ( - cd tools - for p in ${patchDir}/*-CVE-{2013-4231,2013-4232}.patch; do - patch -p0 < "$p" - done - ) - patch -p0 < ${patchDir}/${if stdenv.isDarwin then "tiff-4.0.3" else "*"}-tiff2pdf-colors.patch - ''; # ^ sh on darwin seems not to expand globs in redirects, and I don't want to rebuild all again elsewhere - nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) |