diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/twinkle/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/php/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/graphviz/2.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/instant-messengers/twinkle/default.nix b/pkgs/applications/networking/instant-messengers/twinkle/default.nix index b096023eaa4..90528b35140 100644 --- a/pkgs/applications/networking/instant-messengers/twinkle/default.nix +++ b/pkgs/applications/networking/instant-messengers/twinkle/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ./boost_regex.patch # modified not to use "-mt" suffix ]; - configureFlags = "--with-extra-includes=${libjpeg}/include"; + configureFlags = "--with-extra-includes=${libjpeg.dev}/include"; buildInputs = [ pkgconfig autoreconfHook commoncpp2 openssl boost libsndfile diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 37956dde422..3d455343dad 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -135,7 +135,7 @@ let "--with-gd" "--with-freetype-dir=${freetype.dev}" "--with-png-dir=${libpng}" - "--with-jpeg-dir=${libjpeg}" + "--with-jpeg-dir=${libjpeg.dev}" ]; buildInputs = [ libpng libjpeg freetype ]; }; diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index 1607387160d..47f7ebd3e50 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} (fixed: rec { preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; configureFlags = [ - "--with-jpeg=${libjpeg}" + "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libpng=${libpng}" # 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 0e4b4d03541..2735936dc28 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -24,7 +24,7 @@ composableDerivation.composableDerivation {} (fixed: rec { preConfigure = "export CFLAGS=-O0 CXXFLAGS=-O0; unset CC CXX"; configureFlags = [ - "--with-jpeg=${libjpeg}" + "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) "--with-libpng=${libpng}" # optional "--with-libz=${zlib}" # optional diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 9799c83c822..1fb49ac0e26 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng.out}/lib" - "--with-jpegincludedir=${libjpeg}/include" + "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index aa0f02d34c3..8339f22f3ed 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--with-pngincludedir=${libpng}/include" "--with-pnglibdir=${libpng.out}/lib" - "--with-jpegincludedir=${libjpeg}/include" + "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" "--with-expatincludedir=${expat.dev}/include" "--with-expatlibdir=${expat.out}/lib" diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f7f45849c3..b6e3f506e19 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7123,7 +7123,7 @@ in modules // { HDF5_DIR="${pkgs.hdf5}"; NETCDF4_DIR="${pkgs.netcdf}"; CURL_DIR="${pkgs.curl.dev}"; - JPEG_DIR="${pkgs.libjpeg}"; + JPEG_DIR="${pkgs.libjpeg.dev}"; meta = { description = "interface to netCDF library (versions 3 and 4)"; |