From 48f11e576b7e1285193aeb828d749d93a1906ef5 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Tue, 2 Dec 2008 12:27:17 +0000
Subject: [PATCH] update of gnomeicontheme

svn path=/nixpkgs/trunk/; revision=13548
---
 pkgs/desktops/gnome/default.nix                  | 1 +
 pkgs/desktops/gnome/gnome-icon-theme.nix         | 5 +++--
 pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix | 8 ++++++--
 pkgs/top-level/all-packages.nix                  | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 6382cd7010a..6af4fd032d8 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -155,6 +155,7 @@ rec {
   gnomeicontheme = import ./gnome-icon-theme.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser
       iconnamingutils gettext;
+    inherit (args) intltool;
     input = desktop.gnomeicontheme;
   };
 
diff --git a/pkgs/desktops/gnome/gnome-icon-theme.nix b/pkgs/desktops/gnome/gnome-icon-theme.nix
index 6ee8995305d..fbfe154401e 100644
--- a/pkgs/desktops/gnome/gnome-icon-theme.nix
+++ b/pkgs/desktops/gnome/gnome-icon-theme.nix
@@ -1,11 +1,12 @@
 { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser
-, iconnamingutils, gettext
+, iconnamingutils, gettext, intltool
 }:
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser iconnamingutils gettext];
+  buildInputs = [intltool pkgconfig perl perlXMLParser iconnamingutils gettext ];
 
+  # the ln line can be removed because pkgconfig adds both locations
   postInstall = "
     ensureDir $out/lib
     ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
index d1308fc1ee5..866882569c3 100644
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
+++ b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
@@ -193,9 +193,13 @@
   gnomeicontheme = {
     name = "gnome-icon-theme-2.22.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2;
-      md5 = "a4c03092da28ad53ed3867aef83f29d9";
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.25/2.25.1/sources/gnome-icon-theme-2.24.0.tar.bz2;
+      sha256 = "1ciid3p21n5m2ixdc7b6sqjvw68pzg1adxljrcy7snnnxbwqj7xp";
     };
+    #src = fetchurl {
+    #  url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2;
+    #  md5 = "a4c03092da28ad53ed3867aef83f29d9";
+    #};
   };
   gnomekeyring = {
     name = "gnome-keyring-2.22.1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f0fc62aa5fe..0f9ef98926c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8427,7 +8427,7 @@ let
       gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
       libcm python dbus_glib ncurses which libxml2Python
       iconnamingutils openssl hal samba fam libgcrypt libtasn1
-      xmlto  docbook2x  docbook_xsl;
+      xmlto  docbook2x  docbook_xsl intltool;
   });
 
   kdelibs = import ../desktops/kde/kdelibs {