From 807ed4dea3f10312ff03b94346e4560fe2441040 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Wed, 19 May 2010 12:25:41 +0000 Subject: [PATCH] pkgs/desktops/gnome-2.28/default.nix: strip trailing white space svn path=/nixpkgs/trunk/; revision=21861 --- pkgs/desktops/gnome-2.28/default.nix | 70 ++++++++++++++-------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/pkgs/desktops/gnome-2.28/default.nix b/pkgs/desktops/gnome-2.28/default.nix index 22f926021503..e0c325d33d7a 100644 --- a/pkgs/desktops/gnome-2.28/default.nix +++ b/pkgs/desktops/gnome-2.28/default.nix @@ -25,23 +25,23 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig alsaLib; inherit audiofile; }; - + libIDL = import ./platform/libIDL { inherit (pkgs) stdenv fetchurl flex bison pkgconfig; inherit (pkgs.gtkLibs) glib; gettext = if pkgs.stdenv.isDarwin then pkgs.gettext else null; }; - + ORBit2 = import ./platform/ORBit2 { inherit (pkgs) stdenv fetchurl pkgconfig; inherit (pkgs.gtkLibs) glib; inherit libIDL; }; - + libart_lgpl = import ./platform/libart_lgpl { inherit (pkgs) stdenv fetchurl; }; - + libglade = import ./platform/libglade { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 python gettext; inherit (pkgs.gtkLibs) gtk; @@ -69,11 +69,11 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig gettext libxml2; inherit (pkgs.gtkLibs) gtk; }; - + intltool = import ./platform/intltool { inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser gettext; }; - + GConf = import ./platform/GConf { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxml2 policykit; inherit (pkgs.gtkLibs) glib; @@ -92,47 +92,47 @@ rec { inherit (pkgs) stdenv fetchgit pkgconfig autoconf automake libtool; }; - + gnome_mime_data = import ./platform/gnome-mime-data { inherit (pkgs) stdenv fetchurl; inherit intltool; }; - + gnome_vfs = import ./platform/gnome-vfs { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 bzip2 openssl samba dbus_glib fam hal cdparanoia; inherit (pkgs.gtkLibs) glib; inherit intltool GConf gnome_mime_data; }; - + gnome_vfs_monikers = import ./platform/gnome-vfs-monikers { inherit (pkgs) stdenv fetchurl pkgconfig; inherit (pkgs.gtkLibs) glib; inherit intltool gnome_vfs libbonobo ORBit2; }; - + libgnome = import ./platform/libgnome { inherit (pkgs) stdenv fetchurl pkgconfig popt zlib; inherit (pkgs.gtkLibs) glib; inherit intltool esound libbonobo GConf gnome_vfs ORBit2; }; - + libgnomeui = import ./platform/libgnomeui { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 xlibs; inherit intltool libgnome libgnomecanvas libbonoboui GConf; inherit gnome_vfs gnome_keyring libglade glib pango; }; - + libbonobo = import ./platform/libbonobo { inherit (pkgs) stdenv fetchurl flex bison pkgconfig dbus_glib libxml2 popt; inherit (pkgs.gtkLibs) glib; inherit intltool ORBit2; }; - + libbonoboui = import ./platform/libbonoboui { inherit (pkgs) stdenv fetchurl bison pkgconfig popt libxml2; inherit intltool libbonobo GConf libgnomecanvas libgnome libglade gtk; }; - + at_spi = import ./platform/at-spi { inherit (pkgs) stdenv fetchurl python pkgconfig popt; inherit (pkgs.xlibs) libX11 libICE libXtst libXi; @@ -147,7 +147,7 @@ rec { }; # What name should we use?? - gtkdoc = gtk_doc; + gtkdoc = gtk_doc; gtkhtml = import ./platform/gtkhtml { inherit (pkgs.gtkLibs) gtk; @@ -155,18 +155,18 @@ rec { inherit GConf gnome_icon_theme; }; - + # Freedesktop library startup_notification = import ./platform/startup-notification { inherit (pkgs) stdenv fetchurl pkgconfig xlibs; }; - + # Required for nautilus libunique = import ./platform/libunique { inherit (pkgs) stdenv fetchurl pkgconfig gettext; inherit (pkgs.gtkLibs) gtk; }; - + gtkglext = import ./platform/gtkglext { inherit (pkgs) stdenv fetchurl mesa pkgconfig; inherit (pkgs.gtkLibs) gtk pango; @@ -179,7 +179,7 @@ rec { inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf; }; - + libsoup = import ./desktop/libsoup { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 gnutls libproxy sqlite curl; inherit (pkgs.gtkLibs) glib; @@ -192,56 +192,56 @@ rec { inherit (pkgs.gtkLibs) gtk; inherit intltool; }; - + # Not part of GNOME desktop, but provides CSS support for librsvg libcroco = import ./desktop/libcroco { inherit (pkgs) stdenv fetchurl pkgconfig libxml2; inherit (pkgs.gtkLibs) glib; }; - + librsvg = import ./desktop/librsvg { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 libgsf bzip2; inherit (pkgs.gtkLibs) glib gtk; inherit libcroco; }; - + libgweather = import ./desktop/libgweather { inherit (pkgs) stdenv fetchurl pkgconfig libxml2; inherit (pkgs.gtkLibs) gtk; inherit intltool GConf libsoup; }; - + gvfs = import ./desktop/gvfs { inherit (pkgs) stdenv fetchurl pkgconfig dbus samba hal libarchive fuse libgphoto2 cdparanoia libxml2 libtool; inherit (pkgs.gtkLibs) glib; inherit intltool GConf gnome_keyring libsoup; }; - + libgnomekbd = import ./desktop/libgnomekbd { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; inherit (pkgs.gtkLibs) glib gtk; inherit intltool GConf libglade; }; - + # Removed from recent GNOME releases, but still required scrollkeeper = import ./desktop/scrollkeeper { inherit (pkgs) stdenv fetchurl pkgconfig perl perlXMLParser libxml2 libxslt docbook_xml_dtd_42; }; - + gnome_doc_utils = import ./desktop/gnome-doc-utils { inherit (pkgs) stdenv fetchurl python pkgconfig libxslt makeWrapper; inherit intltool scrollkeeper; libxml2 = pkgs.libxml2Python; }; - + zenity = import ./desktop/zenity { inherit (pkgs) stdenv fetchurl pkgconfig cairo libxml2 libxslt; inherit (pkgs.gtkLibs) glib gtk pango atk; inherit gnome_doc_utils intltool libglade; inherit (pkgs.xlibs) libX11; }; - + metacity = import ./desktop/metacity { inherit (pkgs) stdenv fetchurl pkgconfig libcanberra; inherit (pkgs.gtkLibs) glib gtk; @@ -254,7 +254,7 @@ rec { inherit (pkgs.gtkLibs) glib; inherit intltool; }; - + gnome_desktop = import ./desktop/gnome-desktop { inherit (pkgs) stdenv fetchurl pkgconfig python libxslt which; libxml2 = pkgs.libxml2Python; @@ -262,7 +262,7 @@ rec { inherit (pkgs.gtkLibs) gtk; inherit intltool GConf gnome_doc_utils; }; - + gnome_panel = import ./desktop/gnome-panel { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib dbus cairo popt which bzip2 python libxslt; libxml2 = pkgs.libxml2Python; @@ -271,20 +271,20 @@ rec { inherit intltool ORBit2 libglade libgnome libgnomeui libbonobo libbonoboui GConf gnome_menus gnome_desktop; inherit libwnck librsvg libgweather gnome_doc_utils libgnomecanvas libart_lgpl; }; - + gnome_session = import ./desktop/gnome-session { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib cairo dbus; inherit (pkgs.gtkLibs) gtk pango atk; inherit (pkgs.xlibs) libXau libXtst inputproto; inherit intltool libglade startup_notification GConf; }; - + gnome_settings_daemon = import ./desktop/gnome-settings-daemon { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier; inherit (pkgs.gtkLibs) gtk; inherit intltool GConf gnome_desktop libglade libgnomekbd; }; - + gnome_control_center = import ./desktop/gnome-control-center { inherit (pkgs) stdenv fetchurl pkgconfig dbus_glib libxklavier hal libtool bzip2; inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils; @@ -301,7 +301,7 @@ rec { inherit (pkgs.gtkLibs) atk glib gtk pango; libxml2 = pkgs.libxml2Python; }; - + nautilus = import ./desktop/nautilus { inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info; inherit (pkgs.gtkLibs) gtk; @@ -316,7 +316,7 @@ rec { inherit (pkgs) stdenv fetchurl pkgconfig ncurses python; inherit intltool glib gtk; }; - + #### BINDINGS libglademm = import ./bindings/libglademm {