Fixing wrong merge again - hopefully correctly this time
svn path=/nixpkgs/trunk/; revision=15853
This commit is contained in:
parent
8faec095df
commit
df867eddba
@ -4047,7 +4047,7 @@ let
|
||||
};
|
||||
|
||||
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
|
||||
libjpeg libtiff libpng libxml2 libxslt sqlite
|
||||
icu cairo perl intltool automake libtool
|
||||
|
Loading…
Reference in New Issue
Block a user