diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-09 00:41:27 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-06-09 00:41:27 +0200 |
| commit | 99b88cfb5354337ec55e38ae8d42fb08dc14d25b (patch) | |
| tree | 19336faadeb27fb06dca63cf47d0d0db4a07729b /pkgs/development/libraries/libtiff/default.nix | |
| parent | 61129e1ee9a37d75f2f26c8eb5de1c984766a461 (diff) | |
| parent | 8c4a613f3a478c1cb2994fb9df3b0eb92d4c7885 (diff) | |
| download | nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.gz nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.bz2 nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.lz nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.xz nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.tar.zst nixpkgs-99b88cfb5354337ec55e38ae8d42fb08dc14d25b.zip | |
Merge remote-tracking branch 'origin/master' into multiple-outputs
Conflicts: pkgs/development/libraries/acl/default.nix pkgs/development/libraries/atk/2.6.x.nix pkgs/development/libraries/attr/default.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/freetype/default.nix pkgs/development/libraries/glib/2.34.x.nix pkgs/development/libraries/gtk+/2.24.x.nix pkgs/development/libraries/libtiff/default.nix pkgs/development/libraries/openssl/default.nix pkgs/development/libraries/pango/1.30.x.nix pkgs/misc/cups/default.nix pkgs/os-specific/linux/util-linux/default.nix pkgs/servers/x11/xorg/builder.sh pkgs/servers/x11/xorg/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/libraries/libtiff/default.nix')
| -rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 0657dc30369..44b28645927 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, zlib, libjpeg }: -stdenv.mkDerivation { - name = "libtiff-3.9.4"; +let version = "3.9.7"; in + +stdenv.mkDerivation rec { + name = "libtiff-${version}"; src = fetchurl { urls = - [ ftp://ftp.remotesensing.org/pub/libtiff/tiff-3.9.4.tar.gz - http://download.osgeo.org/libtiff/tiff-3.9.4.tar.gz + [ "ftp://ftp.remotesensing.org/pub/libtiff/tiff-${version}.tar.gz" + "http://download.osgeo.org/libtiff/tiff-${version}.tar.gz" ]; - sha256 = "19hxd773yxcs4lxlc3zfdkz5aiv705vj2jvy5srpqkxpbw3nvdv7"; + sha256 = "0spg1hr5rsrmg88sfzb05qnf0haspq7r5hvdkxg5zib1rva4vmpm"; }; outputs = [ "dev" "out" "bin" "doc" ]; - enableParallelBuilding = true; - propagatedBuildInputs = [ zlib libjpeg ]; + enableParallelBuilding = true; + meta = { description = "Library and utilities for working with the TIFF image file format"; homepage = http://www.libtiff.org/; |