git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #21473 from stepcut/netpbm-fix-libjpeg-paths

netbpm: tell config.mk where to find JPEGLIB and JPEGHDR_DIR or jpegtopnm and friends will not be built

commit3b0720dbe445fd558bf8d235c0f0139bd7b0d901 authorMichael Raskin <7c6f434c@mail.ru> dateFri 30 Dec 2016, 22:04 (10 years ago) parent9e1ec53e243ec4
1 file changed+3−1
pkgs/tools/graphics/netpbm/default.nix+3−1
pkgs/tools/graphics/netpbm/default.nix+3−1
@@ -24,7 +24,9 @@ stdenv.mkDerivation rec {
2424 echo "STATICLIB_TOO = n" >> config.mk
2525 substituteInPlace "config.mk" \
2626 --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
27− --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include"
27+ --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \
28+ --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \
29+ --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include"
2830 '' + stdenv.lib.optionalString stdenv.isDarwin ''
2931 echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk
3032 echo "NETPBMLIBTYPE = dylib" >> config.mk