diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-29 14:19:58 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-10-29 14:19:58 +0000 |
commit | cb7dfb9652b196bd945e3862a4ccb64271214fd3 (patch) | |
tree | 5a7e9778604507d20fa247be31d5b6241a09cb47 /pkgs | |
parent | 843617bac98824c3fb7b11949dcc155635aecfd7 (diff) |
* libtiff 3.9.1.
svn path=/nixpkgs/branches/xorg-7.5/; revision=18027
Diffstat (limited to 'pkgs')
-rw-r--r-- | pkgs/development/libraries/libtiff/builder.sh | 5 | ||||
-rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 20 |
2 files changed, 12 insertions, 13 deletions
diff --git a/pkgs/development/libraries/libtiff/builder.sh b/pkgs/development/libraries/libtiff/builder.sh deleted file mode 100644 index dd1bdebd39c16..0000000000000 --- a/pkgs/development/libraries/libtiff/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -configureFlags="--with-DIR_MAN=$out/man --with-ZIP --with-JPEG" - -genericBuild diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 3a47356d1de56..e2a25583326bd 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,14 +1,18 @@ -{stdenv, fetchurl, zlib, libjpeg}: - -assert zlib != null && libjpeg != null; +{ stdenv, fetchurl, zlib, libjpeg }: stdenv.mkDerivation { - name = "libtiff-3.8.2"; - builder = ./builder.sh; + name = "libtiff-3.9.1"; + src = fetchurl { - url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.8.2.tar.gz; - md5 = "fbb6f446ea4ed18955e2714934e5b698"; + url = ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.1.tar.gz; + sha256 = "168yssav47xih2y17m7psj4k6ngnfai300bbfznc75hn3crxfdil"; }; + propagatedBuildInputs = [zlib libjpeg]; - inherit zlib libjpeg; + + meta = { + description = "Library and utilities for working with the TIFF image file format"; + homepage = http://www.libtiff.org/; + license = "bsd"; + }; } |