treewide: Make explicit that 'dev' output of libpng is used
This commit is contained in:
committed by
Vladimír Čunát
parent
603dcd6263
commit
309b2644ac
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user