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

* Fix ugly indentation.

Browse Source 
svn path=/nixpkgs/trunk/; revision=27609
This commit is contained in:
Eelco Dolstra 2011-07-05 13:43:44 +00:00
parent 5a7ffcd82d
commit bba37cbf92
1 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4349,45 +4349,47 @@ let
vxl = callPackage ../development/libraries/vxl { };
webkit = let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_33;
gnome28 = x.gnome28 // {
webkit =
let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_33;
};
gnome28 = x.gnome28 // {
libsoup = x.gnome28.libsoup_2_33;
};
});
in
(p.builderDefsPackage ../development/libraries/webkit {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
in
(p.builderDefsPackage ../development/libraries/webkit {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
webkitSVN = let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_33;
gnome28 = x.gnome28 // {
webkitSVN =
let p = applyGlobalOverrides (x : {
libsoup = x.gnome28.libsoup_2_33;
};
});
in
(p.builderDefsPackage ../development/libraries/webkit/svn.nix {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
gnome28 = x.gnome28 // {
libsoup = x.gnome28.libsoup_2_33;
};
});
in
(p.builderDefsPackage ../development/libraries/webkit/svn.nix {
inherit (p.gnome28) gtkdoc;
inherit (p.gtkLibs) gtk atk pango glib;
inherit (p) freetype fontconfig gettext gperf curl
libjpeg libtiff libpng libxml2 libxslt sqlite
icu cairo perl intltool automake libtool
pkgconfig autoconf bison libproxy enchant
python ruby which flex geoclue libsoup;
inherit (p.gst_all) gstreamer gstPluginsBase gstFfmpeg
gstPluginsGood;
inherit (p.xlibs) libXt renderproto libXrender;
});
wvstreams = callPackage ../development/libraries/wvstreams { };