From 026325e75b5879ff966f85f712d127a263de5958 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sun, 9 Oct 2011 07:11:28 +0000
Subject: [PATCH] Update a few gnome packages

svn path=/nixpkgs/trunk/; revision=29724
---
 .../gnome-2/platform/ORBit2/default.nix       | 17 ++++++++--------
 .../gnome-2/platform/libbonobo/default.nix    | 20 +++++++++++--------
 .../platform/libgnomecanvas/default.nix       | 17 ++++++++--------
 3 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
index 0d536e830b1..e58dd38e369 100644
--- a/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
+++ b/pkgs/desktops/gnome-2/platform/ORBit2/default.nix
@@ -1,13 +1,14 @@
-{stdenv, fetchurl, pkgconfig, glib, libIDL}:
+{stdenv, fetchurl_gnome, pkgconfig, glib, libIDL}:
 
-stdenv.mkDerivation {
-  name = "ORBit2-2.14.17";
+stdenv.mkDerivation rec {
+  name = src.pkgname;
   
-  src = fetchurl {
-    url = mirror://gnome/sources/ORBit2/2.14/ORBit2-2.14.17.tar.bz2;
-    sha256 = "0k4px2f949ac7vmj7b155g1rpf7pmvl48sbnkjhlg4wgcwzwxgv2";
+  src = fetchurl_gnome {
+    project = "ORBit2";
+    major = "2"; minor = "14"; patchlevel = "19";
+    sha256 = "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam";
   };
-  
-  buildInputs = [ pkgconfig ];
+
+  buildNativeInputs = [ pkgconfig ];
   propagatedBuildInputs = [ glib libIDL ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
index 9910965cf91..bd268e5ec43 100644
--- a/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libbonobo/default.nix
@@ -1,13 +1,17 @@
-{stdenv, fetchurl, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt, intltool, ORBit2}:
+{ stdenv, fetchurl_gnome, flex, bison, pkgconfig, glib, dbus_glib, libxml2, popt
+, intltool, ORBit2, procps }:
 
-stdenv.mkDerivation {
-  name = "libbonobo-2.24.2";
+stdenv.mkDerivation rec {
+  name = src.pkgname;
   
-  src = fetchurl {
-    url = mirror://gnome/sources/libbonobo/2.24/libbonobo-2.24.2.tar.bz2;
-    sha256 = "1gr85amd271z0lbr68crcsc24rx1pa5k20f67y3y2mx664527h4m";
+  src = fetchurl_gnome {
+    project = "libbonobo";
+    major = "2"; minor = "32"; patchlevel = "1";
+    sha256 = "0swp4kk6x7hy1rvd1f9jba31lvfc6qvafkvbpg9h0r34fzrd8q4i";
   };
-  
-  buildInputs = [ flex bison pkgconfig dbus_glib libxml2 intltool ];
+
+  preConfigure = "export USER=`whoami`";
+  buildNativeInputs = [ flex bison pkgconfig intltool procps ];
+  buildInputs = [ libxml2 ];
   propagatedBuildInputs = [ popt glib ORBit2 ];
 }
diff --git a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
index 95f484ff7a4..bf2c0360aa2 100644
--- a/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
+++ b/pkgs/desktops/gnome-2/platform/libgnomecanvas/default.nix
@@ -1,14 +1,15 @@
-{ stdenv, fetchurl, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
+{ stdenv, fetchurl_gnome, pkgconfig, gtk, intltool, libart_lgpl, libglade }:
 
-stdenv.mkDerivation {
-  name = "libgnomecanvas-2.26.0";
+stdenv.mkDerivation rec {
+  name = src.pkgname;
   
-  src = fetchurl {
-    url = mirror://gnome/sources/libgnomecanvas/2.26/libgnomecanvas-2.26.0.tar.bz2;
-    sha256 = "13f5rf5pkp9hnyxzvssrxnlykjaixa7vrig9a7v06wrxqfn81d40";
+  src = fetchurl_gnome {
+    project = "libgnomecanvas";
+    major = "2"; minor = "30"; patchlevel = "3";
+    sha256 = "0h6xvswbqspdifnyh5pm2pqq55yp3kn6yrswq7ay9z49hkh7i6w5";
   };
   
-  buildInputs = [ pkgconfig intltool libglade ];
-
+  buildInputs = [ libglade ];
+  buildNativeInputs = [ pkgconfig intltool ];
   propagatedBuildInputs = [ libart_lgpl gtk ];
 }