Merge pull request #14524 from acowley/graphviz

graphviz: build with pango even without xorg
This commit is contained in:
James Cook
2016-04-07 18:18:04 -07:00
+2 -2
View File
@@ -21,8 +21,8 @@ stdenv.mkDerivation rec {
]; ];
buildInputs = buildInputs =
[ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex [ pkgconfig libpng libjpeg expat yacc libtool fontconfig gd gts libdevil flex pango
] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender pango libXaw ] ] ++ stdenv.lib.optionals (xorg != null) [ xorg.xlibsWrapper xorg.libXrender libXaw ]
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin") CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")