summary refs log tree commit diff
path: root/pkgs/desktops/gnome-2
diff options
context:
space:
mode:
authorYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-08 22:46:10 +0000
committerYury G. Kudryashov <urkud.urkud@gmail.com>2012-03-08 22:46:10 +0000
commit01c4e30a8a508667090d42ccd08b9f426ee9847b (patch)
treeff879a57393428a7f4b99e9bf55db811ed9e4084 /pkgs/desktops/gnome-2
parent711fada6eea7021241699ecdfe479c2727875ba7 (diff)
downloadnixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.tar
nixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.tar.gz
nixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.tar.bz2
nixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.tar.lz
nixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.tar.xz
nixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.tar.zst
nixpkgs-01c4e30a8a508667090d42ccd08b9f426ee9847b.zip
gnome-control-center-2.32.1
svn path=/nixpkgs/trunk/; revision=32932
Diffstat (limited to 'pkgs/desktops/gnome-2')
-rw-r--r--pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix24
1 files changed, 7 insertions, 17 deletions
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
index 7d7e6cb6aec..11f874a0e89 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/gnome-control-center/default.nix
@@ -1,29 +1,19 @@
-{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, hal, cairo, popt, which, python
+{ stdenv, fetchurl, pkgconfig, dbus_glib, libxml2Python, libxslt, libxklavier, cairo, popt, which, python
 , shared_mime_info, desktop_file_utils, libunique, libtool, bzip2
 , 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.28.0";
+  name = "gnome-control-center-2.32.1";
+
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-control-center/2.28/gnome-control-center-2.28.0.tar.bz2;
-    sha256 = "0m0z7dn5qzl63cpc8ivagm4yfsfgigfawl5v3df3pw3z4jk2bsfp";
+    url = mirror://gnome/sources/gnome-control-center/2.32/gnome-control-center-2.32.1.tar.bz2;
+    sha256 = "0rkyg6naidql0nv74608mlsr2lzjgnndnxnxv3s0hp4f6mbqnmkw";
   };
-  buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier hal popt which python shared_mime_info desktop_file_utils
+
+  buildInputs = [ pkgconfig dbus_glib libxml2Python libxslt libxklavier popt which python shared_mime_info desktop_file_utils
                   gtk gnome_doc_utils intltool GConf libglade libgnomekbd libunique libtool bzip2 
                   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";
 }