diff options
author | Orivej Desh <orivej@gmx.fr> | 2021-03-06 19:32:55 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-03-06 19:32:55 +0000 |
commit | 91d653217991163dcc65532c50d0def6bcc7b0b7 (patch) | |
tree | 14cb89cb77736b3a2c1730b19e9b649fa996b89c /pkgs/development | |
parent | 1465e8e397ebd48bac55cc99548b7c3386ae005c (diff) | |
download | nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.tar nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.tar.gz nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.tar.bz2 nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.tar.lz nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.tar.xz nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.tar.zst nixpkgs-91d653217991163dcc65532c50d0def6bcc7b0b7.zip |
libtiff: 4.1.0 -> 4.2.0 (#114196)
Diffstat (limited to 'pkgs/development')
-rw-r--r-- | pkgs/development/libraries/libtiff/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/development/libraries/libtiff/default.nix b/pkgs/development/libraries/libtiff/default.nix index 2fad2988898..46c13bbe4a9 100644 --- a/pkgs/development/libraries/libtiff/default.nix +++ b/pkgs/development/libraries/libtiff/default.nix @@ -4,18 +4,19 @@ , pkg-config , cmake -, zlib +, libdeflate , libjpeg , xz +, zlib }: stdenv.mkDerivation rec { - version = "4.1.0"; pname = "libtiff"; + version = "4.2.0"; src = fetchurl { url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz"; - sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax"; + sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b"; }; cmakeFlags = if stdenv.isDarwin then [ @@ -35,7 +36,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config ]; - propagatedBuildInputs = [ zlib libjpeg xz ]; #TODO: opengl support (bogus configure detection) + propagatedBuildInputs = [ libjpeg xz zlib ]; #TODO: opengl support (bogus configure detection) + + buildInputs = [ libdeflate ]; # TODO: move all propagatedBuildInputs to buildInputs. enableParallelBuilding = true; |