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

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:36:59 +03:00 committed by Vladimír Čunát
parent 62479404ea
commit be00816cab
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/applications/networking/instant-messengers/twinkle/default.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
./boost_regex.patch # modified not to use "-mt" suffix ./boost_regex.patch # modified not to use "-mt" suffix
]; ];
configureFlags = "--with-extra-includes=${libjpeg}/include"; configureFlags = "--with-extra-includes=${libjpeg.dev}/include";
buildInputs = buildInputs =
[ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile

2
pkgs/development/interpreters/php/default.nix
View File

@ -135,7 +135,7 @@ let
"--with-gd" "--with-gd"
"--with-freetype-dir=${freetype.dev}" "--with-freetype-dir=${freetype.dev}"
"--with-png-dir=${libpng}" "--with-png-dir=${libpng}"
"--with-jpeg-dir=${libjpeg}" "--with-jpeg-dir=${libjpeg.dev}"
]; ];
buildInputs = [ libpng libjpeg freetype ]; buildInputs = [ libpng libjpeg freetype ];
}; };

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

@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [ configureFlags = [
"--with-jpeg=${libjpeg}" "--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional "--with-libpng=${libpng}" # optional
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional

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

@ -24,7 +24,7 @@ composableDerivation.composableDerivation {} (fixed: rec {
preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX";
configureFlags = [ configureFlags = [
"--with-jpeg=${libjpeg}" "--with-jpeg=${libjpeg.dev}"
"--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libtiff=${libtiff}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional "--with-libpng=${libpng}" # optional
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional

2
pkgs/tools/graphics/graphviz/2.0.nix
View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--with-pngincludedir=${libpng}/include" [ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include" "--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat.dev}/include" "--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib" "--with-expatlibdir=${expat.out}/lib"

2
pkgs/tools/graphics/graphviz/2.32.nix
View File

@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
configureFlags = configureFlags =
[ "--with-pngincludedir=${libpng}/include" [ "--with-pngincludedir=${libpng}/include"
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg}/include" "--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"
"--with-expatincludedir=${expat.dev}/include" "--with-expatincludedir=${expat.dev}/include"
"--with-expatlibdir=${expat.out}/lib" "--with-expatlibdir=${expat.out}/lib"

2
pkgs/top-level/python-packages.nix
View File

@ -7123,7 +7123,7 @@ in modules // {
HDF5_DIR="${pkgs.hdf5}"; HDF5_DIR="${pkgs.hdf5}";
NETCDF4_DIR="${pkgs.netcdf}"; NETCDF4_DIR="${pkgs.netcdf}";
CURL_DIR="${pkgs.curl.dev}"; CURL_DIR="${pkgs.curl.dev}";
JPEG_DIR="${pkgs.libjpeg}"; JPEG_DIR="${pkgs.libjpeg.dev}";
meta = { meta = {
description = "interface to netCDF library (versions 3 and 4)"; description = "interface to netCDF library (versions 3 and 4)";