Added a few more GNOME 2.26 packages

svn path=/nixpkgs/trunk/; revision=15856

4 files changed, 72 insertions, 0 deletions

diff --git a/pkgs/desktops/gnome-2.26/default.nix b/pkgs/desktops/gnome-2.26/default.nix
index 2ae7d34a22a1..65ca94b62a74 100644
--- a/pkgs/desktops/gnome-2.26/default.nix
+++ b/pkgs/desktops/gnome-2.26/default.nix
@@ -160,6 +160,12 @@ rec {
     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;
@@ -213,6 +219,22 @@ rec {
     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;
+    inherit (pkgs) cairo popt which python libxslt shared_mime_info desktop_file_utils;
+    inherit (pkgs.gtkLibs) glib gtk pango atk;
+    inherit gnome_doc_utils intltool GConf libglade libgnome libgnomeui libgnomekbd;
+    inherit librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon;
+    inherit libbonobo libbonoboui libgnomecanvas libart_lgpl gnome_vfs ORBit2;
+    libxml2 = pkgs.libxml2Python;
+  };
+  
   nautilus = import ./desktop/nautilus {
     inherit (pkgs) stdenv fetchurl pkgconfig libxml2 dbus_glib libexif shared_mime_info;
     inherit (pkgs.gtkLibs) gtk;
diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix
new file mode 100644
index 000000000000..6a7d54b8f09e
--- /dev/null
+++ b/pkgs/desktops/gnome-2.26/desktop/gnome-control-center/default.nix
@@ -0,0 +1,29 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2, libxslt, libxklavier, hal, cairo, popt, which, python
+, shared_mime_info, desktop_file_utils
+, glib, gtk, pango, atk, gnome_doc_utils, intltool, GConf, libglade, libgnome, libgnomeui, libgnomekbd
+, librsvg, gnome_menus, gnome_desktop, gnome_panel, metacity, gnome_settings_daemon
+, libbonobo, libbonoboui, libgnomecanvas, libart_lgpl, gnome_vfs, ORBit2}:
+
+stdenv.mkDerivation {
+  name = "gnome-control-center-2.26.0";
+  src = fetchurl {
+    url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-control-center-2.26.0.tar.bz2;
+    sha256 = "01cwx784whzz9pnn3xvjgwqjyb187bmr56r5qm9im5sk23m89yv2";
+  };
+  buildInputs = [ pkgconfig dbus_glib libxml2 libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
+                  gtk gnome_doc_utils intltool GConf libglade libgnomekbd
+                  libgnomeui librsvg gnome_menus gnome_desktop gnome_panel metacity gnome_settings_daemon ];
+  configureFlags = "--disable-scrollkeeper";
+  # This makes me cry
+  CPPFLAGS = "-I${glib}/include/glib-2.0 -I${glib}/lib/glib-2.0/include "+
+             "-I${gtk}/include/gtk-2.0 -I${gtk}/lib/gtk-2.0/include -I${cairo}/include/cairo "+
+             "-I${pango}/include/pango-1.0 -I${atk}/include/atk-1.0 "+
+	     "-I${gnome_desktop}/include/gnome-desktop-2.0 -I${gnome_menus}/include/gnome-menus "+
+	     "-I${libgnomeui}/include/libgnomeui-2.0 -I${libbonoboui}/include/libbonoboui-2.0 "+
+	     "-I${libgnomecanvas}/include/libgnomecanvas-2.0 -I${libart_lgpl}/include/libart-2.0 "+
+	     "-I${libgnome}/include/libgnome-2.0 -I${gnome_vfs}/include/gnome-vfs-2.0 "+
+	     "-I${libbonobo}/include/libbonobo-2.0 -I${libbonobo}/include/bonobo-activation-2.0 "+
+	     "-I${ORBit2}/include/orbit-2.0 -I${GConf}/include/gconf/2 -I${librsvg}/include/librsvg-2 "+
+	     "-I${gnome_panel}/include/panel-2.0";
+  LIBS = "-lXft -lglib-2.0 -lgtk-x11-2.0 -lrsvg-2 -lgconf-2 -lgnome-desktop-2 -lgnome-menu -lgnomeui-2";
+}
diff --git a/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix b/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix
new file mode 100644
index 000000000000..d00cada7ea26
--- /dev/null
+++ b/pkgs/desktops/gnome-2.26/desktop/gnome-settings-daemon/default.nix
@@ -0,0 +1,11 @@
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, gtk
+, intltool, GConf, gnome_desktop, libglade, libgnomekbd}:
+
+stdenv.mkDerivation {
+  name = "gnome-settings-daemon-2.26.1";
+  src = fetchurl {
+    url = mirror://gnome/desktop/2.26/2.26.2/sources/gnome-settings-daemon-2.26.1.tar.bz2;
+    sha256 = "100ax9dfcd0wzfsdv4p75qq950hqvpqnsa315wq5wj7yhjm1vzsd";
+  };
+  buildInputs = [ pkgconfig intltool dbus_glib libxklavier gtk GConf gnome_desktop libglade libgnomekbd ];
+}
diff --git a/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix b/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix
new file mode 100644
index 000000000000..1a0ff9f51b79
--- /dev/null
+++ b/pkgs/desktops/gnome-2.26/desktop/libgnomekbd/default.nix
@@ -0,0 +1,10 @@
+{stdenv, fetchurl, pkgconfig, dbus_glib, libxklavier, glib, gtk, intltool, GConf, libglade}:
+
+stdenv.mkDerivation {
+  name = "libgnomekbd-2.26.0";
+  src = fetchurl {
+    url = mirror://gnome/desktop/2.26/2.26.2/sources/libgnomekbd-2.26.0.tar.bz2;
+    sha256 = "0krn24c7c207vhsaizz5vybyni2rc2x245p3hv9sivgayd93b996";
+  };
+  buildInputs = [ pkgconfig dbus_glib libxklavier glib gtk intltool GConf libglade ];
+}