alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #14524 from acowley/graphviz

Browse source 
graphviz: build with pango even without xorg
This commit is contained in:
James Cook 2016-04-07 18:18:04 -07:00
parent fdf8e2a197 9b0890cfa5
commit 0f18769542
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/tools/graphics/graphviz/default.nix
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")