diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:39:17 +0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:46 +0200 |
| commit | ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d (patch) | |
| tree | 6218d9da6b2f494b72015c669b67dc94b42be99b | |
| parent | d7071caba5e0b3ae010c1cee74997c4acb851998 (diff) | |
| download | nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.tar nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.tar.gz nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.tar.bz2 nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.tar.lz nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.tar.xz nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.tar.zst nixlib-ad1a47061ed7a0dd71b5550ab615e0c4d4636f1d.zip | |
treewide: Make explicit that 'dev' output of libtiff is used
| -rw-r--r-- | pkgs/applications/graphics/qtpfsgui/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/libraries/gdal/gdal-1_11.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/netpbm/default.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/applications/graphics/qtpfsgui/default.nix b/pkgs/applications/graphics/qtpfsgui/default.nix index 1a97df22342e..befdf1b4e7c1 100644 --- a/pkgs/applications/graphics/qtpfsgui/default.nix +++ b/pkgs/applications/graphics/qtpfsgui/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "EXIV2PATH=${exiv2}/include/exiv2" "OPENEXRDIR=${openexr}/include/OpenEXR" "FFTW3DIR=${fftwSinglePrec.dev}/include" - "LIBTIFFDIR=${libtiff}/include" + "LIBTIFFDIR=${libtiff.dev}/include" ]; meta = { diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index d01661113fe6..40c8178834e4 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -30,7 +30,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--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-libz=${zlib}" # optional diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index ddb760873965..fec52be924d9 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -25,7 +25,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--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-libz=${zlib}" # optional diff --git a/pkgs/tools/graphics/netpbm/default.nix b/pkgs/tools/graphics/netpbm/default.nix index 4a52434d379a..bebf7680ded3 100644 --- a/pkgs/tools/graphics/netpbm/default.nix +++ b/pkgs/tools/graphics/netpbm/default.nix @@ -26,7 +26,7 @@ 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}/include" + --replace "TIFFHDR_DIR =" "TIFFHDR_DIR = ${libtiff.dev}/include" ''; preBuild = '' |