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 /pkgs/tools/graphics | |
| parent | 603dcd6263effbae1342486c3defbc1737c6ed9a (diff) | |
| download | nixlib-309b2644acb704ecf67371274e1f6363946f00e7.tar nixlib-309b2644acb704ecf67371274e1f6363946f00e7.tar.gz nixlib-309b2644acb704ecf67371274e1f6363946f00e7.tar.bz2 nixlib-309b2644acb704ecf67371274e1f6363946f00e7.tar.lz nixlib-309b2644acb704ecf67371274e1f6363946f00e7.tar.xz nixlib-309b2644acb704ecf67371274e1f6363946f00e7.tar.zst nixlib-309b2644acb704ecf67371274e1f6363946f00e7.zip | |
treewide: Make explicit that 'dev' output of libpng is used
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.0.nix | 2 | ||||
| -rw-r--r-- | pkgs/tools/graphics/graphviz/2.32.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/graphics/graphviz/2.0.nix b/pkgs/tools/graphics/graphviz/2.0.nix index 1fb49ac0e262..0a11c3c8b283 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 8339f22f3edb..695ac898fe8b 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" |