public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into closure-size

Browse Source 
Comparison to master evaluations on Hydra:
  - 1255515 for nixos
  - 1255502 for nixpkgs
This commit is contained in:
Vladimír Čunát
2016-04-10 11:17:52 +02:00
parent 50fccad582 2463e09173
commit 30f14243c3
344 changed files with 58220 additions and 29215 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/graphics/graphviz/default.nix
+2 -2
View File
@@ -21,9 +21,9 @@ stdenv.mkDerivation rec {
];
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)
(with xorg; [ xlibsWrapper libXrender pango libXaw libXpm ])
(with xorg; [ xlibsWrapper libXrender libXaw libXpm ])
++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext;
CPPFLAGS = stdenv.lib.optionalString (xorg != null && stdenv.system == "x86_64-darwin")