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

Merge branch 'master' into x-updates

Browse Source 
Conflicts (easy):
	pkgs/desktops/xfce/core/xfdesktop.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/pango/default.nix
This commit is contained in:
Vladimír Čunát
2013-03-17 11:28:28 +01:00
parent 516133a4fd 8acaea6d57
commit b1eeae8cac
108 changed files with 1216 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/libraries/cairo/default.nix
+2 -1
View File
@@ -24,7 +24,8 @@ stdenv.mkDerivation rec {
};
buildInputs = with xlibs;
[ pkgconfig x11 fontconfig libXrender expat ]
[ pkgconfig x11 fontconfig expat ]
++ stdenv.lib.optional (!stdenv.isDarwin) libXrender
++ stdenv.lib.optionals xcbSupport [ libxcb xcbutil ]
++ stdenv.lib.optionals glSupport [ mesa ]