diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-26 00:14:24 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-01 15:13:03 +0100 |
| commit | 90180905a2557aefaf4f9ca5416968d829254861 (patch) | |
| tree | 290397d27d22ceac2b8b184491aec05a785c0498 /pkgs/tools/graphics | |
| parent | aa1aefd06a135f88a87e871dba3a1665130d3d8d (diff) | |
| download | nixlib-90180905a2557aefaf4f9ca5416968d829254861.tar nixlib-90180905a2557aefaf4f9ca5416968d829254861.tar.gz nixlib-90180905a2557aefaf4f9ca5416968d829254861.tar.bz2 nixlib-90180905a2557aefaf4f9ca5416968d829254861.tar.lz nixlib-90180905a2557aefaf4f9ca5416968d829254861.tar.xz nixlib-90180905a2557aefaf4f9ca5416968d829254861.tar.zst nixlib-90180905a2557aefaf4f9ca5416968d829254861.zip | |
netpbm: Fix tiff support
The build script check whether JPEGLIB and ZLIB are not set to NONE. We did not set the latter as pkg-config handles zlib requirement for libpng dependency and the comment in config.mk only talks about zlib being needed for libpng. Since libtiff only needs libz for static linking, we turn TIFFLIB_NEEDS_ZLIB off instead of pointlessly setting ZLIB value. Closes: https://github.com/NixOS/nixpkgs/issues/75156
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 99946c5a9e5b..2755b6b2a0e5 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -58,6 +58,8 @@ stdenv.mkDerivation { substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \ + --replace "TIFFLIB_NEEDS_JPEG = Y" "TIFFLIB_NEEDS_JPEG = N" \ + --replace "TIFFLIB_NEEDS_Z = Y" "TIFFLIB_NEEDS_Z = N" \ --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \ --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' |