mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-02 15:41:48 +00:00
graphviz: simplify and add a missing X library
This commit is contained in:
parent
31d9263159
commit
74d4fc7959
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user