diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-10-15 19:00:25 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-10-28 10:15:52 +0100 |
| commit | 74d4fc795921a57775739a38fa741afe8fa23ed9 (patch) | |
| tree | ef6e47024e1e412aae4c48a031abd441947dda1a /pkgs/tools/graphics | |
| parent | 31d9263159b4689b29f1654c740eefe188199462 (diff) | |
| download | nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.tar nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.tar.gz nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.tar.bz2 nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.tar.lz nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.tar.xz nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.tar.zst nixlib-74d4fc795921a57775739a38fa741afe8fa23ed9.zip | |
graphviz: simplify and add a missing X library
Diffstat (limited to 'pkgs/tools/graphics')
| -rw-r--r-- | pkgs/tools/graphics/graphviz/default.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 993e6314fb8d..0e83899f0b73 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw +{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat , yacc, libtool, fontconfig, pango, gd, xorg, gts, libdevil, gettext, cairo , flex }: @@ -22,21 +22,14 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex - ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] + ] ++ stdenv.lib.optionals (xorg != null) + (with xorg; [ xlibsWrapper libXrender pango libXaw libXpm ]) ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") "-I${cairo.dev}/include/cairo"; - configureFlags = - [ "--with-pngincludedir=${libpng}/include" - "--with-pnglibdir=${libpng}/lib" - "--with-jpegincludedir=${libjpeg}/include" - "--with-jpeglibdir=${libjpeg}/lib" - "--with-expatincludedir=${expat}/include" - "--with-expatlibdir=${expat}/lib" - ] - ++ stdenv.lib.optional (xorg == null) "--without-x"; + configureFlags = stdenv.lib.optional (xorg == null) "--without-x"; preBuild = '' sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile |