libtiff: 4.1.0 -> 4.2.0 (#114196)
This commit is contained in:
parent
1465e8e397
commit
91d6532179
1 changed files with 7 additions and 4 deletions
|
@ -4,18 +4,19 @@
|
||||||
, pkg-config
|
, pkg-config
|
||||||
, cmake
|
, cmake
|
||||||
|
|
||||||
, zlib
|
, libdeflate
|
||||||
, libjpeg
|
, libjpeg
|
||||||
, xz
|
, xz
|
||||||
|
, zlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
version = "4.1.0";
|
|
||||||
pname = "libtiff";
|
pname = "libtiff";
|
||||||
|
version = "4.2.0";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
|
url = "https://download.osgeo.org/libtiff/tiff-${version}.tar.gz";
|
||||||
sha256 = "0d46bdvxdiv59lxnb0xz9ywm8arsr6xsapi5s6y6vnys2wjz6aax";
|
sha256 = "1jrkjv0xya9radddn8idxvs2gqzp3l2b1s8knlizmn7ad3jq817b";
|
||||||
};
|
};
|
||||||
|
|
||||||
cmakeFlags = if stdenv.isDarwin then [
|
cmakeFlags = if stdenv.isDarwin then [
|
||||||
|
@ -35,7 +36,9 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake pkg-config ];
|
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;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue