diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-04-16 20:37:32 +0300 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-19 10:00:44 +0200 |
commit | 309b2644acb704ecf67371274e1f6363946f00e7 (patch) | |
tree | d1901c011a281ab05a8c735ee15cc73bb70308ec | |
parent | 603dcd6263effbae1342486c3defbc1737c6ed9a (diff) | |
download | nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.tar nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.tar.gz nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.tar.bz2 nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.tar.lz nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.tar.xz nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.tar.zst nixpkgs-309b2644acb704ecf67371274e1f6363946f00e7.zip |
treewide: Make explicit that 'dev' output of libpng is used
-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/development/libraries/slang/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/2.0.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 3d455343dad..3e111b3538d 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -134,7 +134,7 @@ let configureFlags = [ "--with-gd" "--with-freetype-dir=${freetype.dev}" - "--with-png-dir=${libpng}" + "--with-png-dir=${libpng.dev}" "--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 47f7ebd3e50..d01661113fe 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -31,7 +31,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) - "--with-libpng=${libpng}" # optional + "--with-libpng=${libpng.dev}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" diff --git a/pkgs/development/libraries/gdal/gdal-1_11.nix b/pkgs/development/libraries/gdal/gdal-1_11.nix index 2735936dc28..ddb76087396 100644 --- a/pkgs/development/libraries/gdal/gdal-1_11.nix +++ b/pkgs/development/libraries/gdal/gdal-1_11.nix @@ -26,7 +26,7 @@ composableDerivation.composableDerivation {} (fixed: rec { configureFlags = [ "--with-jpeg=${libjpeg.dev}" "--with-libtiff=${libtiff}" # optional (without largetiff support) - "--with-libpng=${libpng}" # optional + "--with-libpng=${libpng.dev}" # optional "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" diff --git a/pkgs/development/libraries/slang/default.nix b/pkgs/development/libraries/slang/default.nix index e83718673aa..70f7270f1b8 100644 --- a/pkgs/development/libraries/slang/default.nix +++ b/pkgs/development/libraries/slang/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sed -i -e "s|/bin/ln|ln|" src/Makefile.in sed -i -e "s|-ltermcap|-lncurses|" ./configure ''; - configureFlags = "--with-png=${libpng} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; + configureFlags = "--with-png=${libpng.dev} --with-z=${zlib} --with-pcre=${pcre} --with-readline=${readline}"; buildInputs = [ pcre libpng zlib readline ]; propagatedBuildInputs = [ ncurses ]; diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 1fb49ac0e26..0a11c3c8b28 100644 --- a/pkgs/tools/graphics/graphviz/2.0.nix +++ b/pkgs/tools/graphics/graphviz/2.0.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; configureFlags = - [ "--with-pngincludedir=${libpng}/include" + [ "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix index 8339f22f3ed..695ac898fe8 100644 --- a/pkgs/tools/graphics/graphviz/2.32.nix +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; configureFlags = - [ "--with-pngincludedir=${libpng}/include" + [ "--with-pngincludedir=${libpng.dev}/include" "--with-pnglibdir=${libpng.out}/lib" "--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpeglibdir=${libjpeg.out}/lib" |