public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

treewide: Make explicit that 'dev' output of libtiff is used

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:39:17 +03:00 committed by Vladimír Čunát
parent d7071caba5
commit ad1a47061e
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/graphics/qtpfsgui/default.nix
View File

@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
"EXIV2PATH=${exiv2}/include/exiv2" "EXIV2PATH=${exiv2}/include/exiv2"
"OPENEXRDIR=${openexr}/include/OpenEXR" "OPENEXRDIR=${openexr}/include/OpenEXR"
"FFTW3DIR=${fftwSinglePrec.dev}/include" "FFTW3DIR=${fftwSinglePrec.dev}/include"
"LIBTIFFDIR=${libtiff}/include" "LIBTIFFDIR=${libtiff.dev}/include"
]; ];
meta = { meta = {

2
pkgs/development/libraries/gdal/default.nix
View File

@ -30,7 +30,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
configureFlags = [ configureFlags = [
"--with-jpeg=${libjpeg.dev}" "--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-libpng=${libpng.dev}" # optional "--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional

2
pkgs/development/libraries/gdal/gdal-1_11.nix
View File

@ -25,7 +25,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
configureFlags = [ configureFlags = [
"--with-jpeg=${libjpeg.dev}" "--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libtiff=${libtiff.dev}" # optional (without largetiff support)
"--with-libpng=${libpng.dev}" # optional "--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional

2
pkgs/tools/graphics/netpbm/default.nix
View File

@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
echo "STATICLIB_TOO = n" >> config.mk echo "STATICLIB_TOO = n" >> config.mk
substituteInPlace "config.mk" \ substituteInPlace "config.mk" \
--replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \ --replace "TIFFLIB = NONE" "TIFFLIB = ${libtiff.out}/lib/libtiff.so" \
--replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff}/include" --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include"
''; '';
preBuild = '' preBuild = ''