Author: eelco
Date: Tue Jul 5 13:43:44 2011
New Revision: 27609
URL: https://svn.nixos.org/websvn/nix/?rev=27609&sc=1
Log:
* Fix ugly indentation.
Modified:
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 5 12:54:50
2011 (r27608)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue Jul 5 13:43:44
2011 (r27609)
@@ -4349,45 +4349,47 @@
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 { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
