* Added gnome-icon-theme.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18118

pkgs/applications/misc/evince/default.nix

@@ -1,7 +1,7 @@
 { fetchurl, stdenv, perl, perlXMLParser, gettext, intltool
 , pkgconfig, glib, gtk, gnomedocutils, gnomeicontheme
 , libgnome, libgnomeui, scrollkeeper, libxslt
-, libglade, dbus, dbus_glib
+, libglade, gnome_keyring, dbus, dbus_glib
 , poppler, libspectre, djvulibre, shared_mime_info
 , makeWrapper, which
 , recentListSize ? null # 5 is not enough, allow passing a different number
@@ -16,13 +16,11 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    perl perlXMLParser gettext intltool
+    perl perlXMLParser gettext intltool pkgconfig glib gtk
-    pkgconfig glib gtk gnomedocutils gnomeicontheme
+    gnomedocutils gnomeicontheme libgnome libgnomeui libglade
-    libgnome libgnomeui libglade scrollkeeper
+    scrollkeeper gnome_keyring
     libxslt  # for `xsltproc'
-    dbus dbus_glib
+    dbus dbus_glib poppler libspectre djvulibre makeWrapper which
-    poppler libspectre djvulibre
-    makeWrapper which
   ];
 
   configureFlags = "--with-libgnome --enable-dbus --enable-pixbuf "

pkgs/desktops/gnome-2.28/default.nix

@@ -7,6 +7,15 @@ rec {
   # Backward compatibility.
   gnomevfs = gnome_vfs;
   startupnotification = startup_notification;
+  gnomedocutils = gnome_doc_utils;
+  gnomeicontheme = gnome_icon_theme;
+
+  # !!! Missing! Need to add these.
+  libgnomeprint = throw "libgnomeprint not implemented";
+  libgtkhtml = throw "libgtkhtml not implemented";
+  vte = throw "vte not implemented";
+  libglademm = throw "libglademm not implemented";
+  gtksourceview_24 = gtksourceview;
 
 
 #### PLATFORM
@@ -129,6 +138,11 @@ rec {
     inherit (pkgs.gtkLibs) gtk;
   };
   
+  gtkglext = import ./platform/gtkglext {
+    inherit (pkgs) stdenv fetchurl mesa pkgconfig;
+    inherit (pkgs.gtkLibs) gtk pango;
+  };
+
 #### DESKTOP
 
   gnome_keyring = import ./desktop/gnome-keyring {
@@ -264,8 +278,9 @@ rec {
     inherit gnome_desktop libunique intltool GConf;
   };
 
-  gtkglext = import ./platform/gtkglext {
+  gnome_icon_theme = import ./desktop/gnome-icon-theme {
-    inherit (pkgs) stdenv fetchurl mesa pkgconfig;
+    inherit (pkgs) stdenv fetchurl pkgconfig intltool iconnamingutils;
-    inherit (pkgs.gtkLibs) gtk pango;
+    #inherit (pkgs.gtkLibs) gtk pango;
   };
+  
 }

pkgs/desktops/gnome-2.28/desktop/gnome-icon-theme/default.nix

@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils }:
+
+stdenv.mkDerivation rec {
+  name = "gnome-icon-theme-2.28.0";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/gnome-icon-theme/2.28/${name}.tar.bz2";
+    sha256 = "111q1yijm8mjvz600nfa49gbjz4988vpfv74jcknfng0k92vvv1i";
+  };
+  
+  buildInputs = [ pkgconfig intltool iconnamingutils ];
+}

pkgs/development/tools/misc/icon-naming-utils/default.nix

@@ -1,20 +1,23 @@
 {stdenv, fetchurl, perl, XMLSimple}:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
-  name = "icon-naming-utils-0.8.7";
+  name = "icon-naming-utils-0.8.90";
 
   src = fetchurl {
-    url = http://tango.freedesktop.org/releases/icon-naming-utils-0.8.7.tar.gz;
+    url = "http://tango.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "1lj0lffdg7fjfinhrn0vsq1kj010dxlxlix4jfc969j6l3k9rd0w";
+    sha256 = "071fj2jm5kydlz02ic5sylhmw6h2p3cgrm3gwdfabinqkqcv4jh4";
   };
   
   buildInputs = [perl XMLSimple];
 
-  postInstall = "
+  postInstall =
-    # Add XML::Simple to the runtime search path.
+    ''
-    substituteInPlace $out/libexec/icon-name-mapping \\
+      # Add XML::Simple to the runtime search path.
-        --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl';
+      substituteInPlace $out/libexec/icon-name-mapping \
-    ensureDir $out/lib
+          --replace '/bin/perl' '/bin/perl -I${XMLSimple}/lib/perl5/site_perl'
-    ln -s $out/share/pkgconfig $out/lib/pkgconfig # WTF?
+    '';
-  ";
+
+  meta = {
+    homepage = http://tango.freedesktop.org/Standard_Icon_Naming_Specification;
+  };
 }

pkgs/top-level/all-packages.nix

@@ -6888,7 +6888,7 @@ let
       pkgconfig poppler libspectre djvulibre libxslt
       dbus dbus_glib shared_mime_info which makeWrapper;
     inherit (gnome) gnomedocutils gnomeicontheme libgnome
-      libgnomeui libglade glib gtk scrollkeeper;
+      libgnomeui libglade glib gtk scrollkeeper gnome_keyring;
   };
 
   exrdisplay = import ../applications/graphics/exrdisplay {