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

Fixing wrong merge again - hopefully correctly this time

Browse Source 
svn path=/nixpkgs/trunk/; revision=15853
This commit is contained in:
Michael Raskin 2009-06-04 12:24:08 +00:00
parent 8faec095df
commit df867eddba
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/top-level/all-packages.nix
View File

@ -4047,7 +4047,7 @@ let
}; };
webkit = builderDefsPackage (import ../development/libraries/webkit) { webkit = builderDefsPackage (import ../development/libraries/webkit) {
inherit (gnome) gtk atk pango libsoup gtkdoc; inherit (gnome26) gtk atk pango libsoup gtkdoc;
inherit freetype fontconfig gettext gperf curl inherit freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool icu cairo perl intltool automake libtool