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

Merge remote-tracking branch 'origin/master' into x-updates

Browse Source 
Conflicts:
	pkgs/misc/maven/maven-1.0.nix
	pkgs/os-specific/linux/xf86-input-wacom/default.nix
This commit is contained in:
Eelco Dolstra
2012-09-26 14:51:51 -04:00
parent 3aae4ccffa e710915ffc
commit d5758c99a3
793 changed files with 14306 additions and 5819 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/webkit/gtk2.nix
View File

@@ -13,8 +13,8 @@ rec {
buildInputs = [gtk glib atk cairo curl fontconfig freetype
gettext libjpeg libpng libtiff libxml2 libxslt pango
sqlite icu gperf bison flex autoconf automake libtool
perl intltool pkgconfig libsoup gtkdoc libXt libproxy
enchant python ruby which renderproto libXrender geoclue
intltool pkgconfig libsoup gtkdoc libXt libproxy
enchant python ruby which renderproto libXrender geoclue perl
];
propagatedBuildInputs = [