diff options
| author | Jeremy Shaw <jeremy@n-heptane.com> | 2016-12-28 13:48:50 -0500 |
|---|---|---|
| committer | Jeremy Shaw <jeremy@n-heptane.com> | 2016-12-28 13:48:50 -0500 |
| commit | e243ec43f3728a7e1ddf617af58f18f72b79415d (patch) | |
| tree | 8c877764a817ae9d93e5b34a76fc316f3fe8bba9 /pkgs/tools | |
| parent | 5ac7da93760905148581a543fdb24ce376b69441 (diff) | |
| download | nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.tar nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.tar.gz nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.tar.bz2 nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.tar.lz nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.tar.xz nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.tar.zst nixpkgs-e243ec43f3728a7e1ddf617af58f18f72b79415d.zip | |
netbpm: tell config.mk where to find JPEGLIB and JPEGHDR_DIR or jpegtopnm and friends will not be built.
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index d0381e91251..7fafc5218e9 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -24,7 +24,9 @@ stdenv.mkDerivation rec { echo "STATICLIB_TOO = n" >> config.mk substituteInPlace "config.mk" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ - --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" \ + --replace "JPEGLIB = NONE" "JPEGLIB = ${libjpeg.out}/lib/libjpeg.so" \ + --replace "JPEGHDR_DIR =" "JPEGHDR_DIR = ${libjpeg.dev}/include" '' + stdenv.lib.optionalString stdenv.isDarwin '' echo "LDSHLIB=-dynamiclib -install_name $out/lib/libnetpbm.\$(MAJ).dylib" >> config.mk echo "NETPBMLIBTYPE = dylib" >> config.mk |