ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-24 22:27:30 +03:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tuomas Tynkkynen 2016-04-16 20:37:32 +03:00 committed by Vladimír Čunát
parent 603dcd6263
commit 309b2644ac
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -31,7 +31,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}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional "--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=${postgresql}/bin/pg_config"

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

@ -26,7 +26,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}" # optional (without largetiff support)
"--with-libpng=${libpng}" # optional "--with-libpng=${libpng.dev}" # optional
"--with-libz=${zlib}" # optional "--with-libz=${zlib}" # optional
"--with-pg=${postgresql}/bin/pg_config" "--with-pg=${postgresql}/bin/pg_config"

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

@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
sed -i -e "s|/bin/ln|ln|" src/Makefile.in sed -i -e "s|/bin/ln|ln|" src/Makefile.in
sed -i -e "s|-ltermcap|-lncurses|" ./configure 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 ]; buildInputs = [ pcre libpng zlib readline ];
propagatedBuildInputs = [ ncurses ]; propagatedBuildInputs = [ ncurses ];

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

@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd]; buildInputs = [pkgconfig xlibsWrapper libpng libjpeg expat libXaw yacc libtool fontconfig pango gd];
configureFlags = configureFlags =
[ "--with-pngincludedir=${libpng}/include" [ "--with-pngincludedir=${libpng.dev}/include"
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"

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

@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo";
configureFlags = configureFlags =
[ "--with-pngincludedir=${libpng}/include" [ "--with-pngincludedir=${libpng.dev}/include"
"--with-pnglibdir=${libpng.out}/lib" "--with-pnglibdir=${libpng.out}/lib"
"--with-jpegincludedir=${libjpeg.dev}/include" "--with-jpegincludedir=${libjpeg.dev}/include"
"--with-jpeglibdir=${libjpeg.out}/lib" "--with-jpeglibdir=${libjpeg.out}/lib"