gnome2.gnome-icon-theme: move to pkgs/data/icons

3 files changed, 4 insertions, 38 deletions

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index f1822385f0f..4212fa68bd4 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -60,8 +60,6 @@ lib.makeScope pkgs.newScope (self: with self; {
 
   gtksourceview = callPackage ./desktop/gtksourceview { };
 
-  gnome-icon-theme = callPackage ./desktop/gnome-icon-theme { };
-
   vte = callPackage ./desktop/vte { };
 
 #### BINDINGS
@@ -87,7 +85,8 @@ lib.makeScope pkgs.newScope (self: with self; {
   startup_notification = pkgs.libstartup_notification;
   startupnotification = pkgs.libstartup_notification;
   gnomedocutils = pkgs.gnome-doc-utils;
-  gnomeicontheme = self.gnome-icon-theme;
+  gnome-icon-theme = pkgs.gnome-icon-theme;
   gnome_icon_theme = self.gnome-icon-theme;
+  gnomeicontheme = self.gnome-icon-theme;
   gnome_common = gnome-common;
 })
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
deleted file mode 100644
index 30dacbae740..00000000000
--- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
-
-stdenv.mkDerivation rec {
-  pname = "gnome-icon-theme";
-  version = "3.12.0";
-
-  src = fetchurl {
-    url = "mirror://gnome/sources/gnome-icon-theme/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "0fjh9qmmgj34zlgxb09231ld7khys562qxbpsjlaplq2j85p57im";
-  };
-
-  nativeBuildInputs = [
-    pkgconfig
-    intltool
-    iconnamingutils
-    gtk2
-  ];
-
-  dontDropIconThemeCache = true;
-
-  postInstall = ''
-    # remove a tree of dirs with no files within
-    rm -r "$out/share/locale"
-  '';
-
-  meta = with stdenv.lib; {
-    description = "Collection of icons for the GNOME 2 desktop";
-    homepage = "https://download.gnome.org/sources/gnome-icon-theme/";
-    license = licenses.gpl3Plus;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.romildo ];
-  };
-}
diff --git a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
index bce45c66b6f..5a81c1bcb1a 100644
--- a/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
+{ stdenv, fetchFromGitHub, pkgconfig, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, gnonlin, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }:
 
 stdenv.mkDerivation rec {
   rev = "9ae8768";
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [ pkgconfig ];
-   buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome2.gnome-icon-theme hicolor-icon-theme tango-icon-theme ];
+   buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl gnonlin sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ];
 
   prePatch = ''
     sed -i  -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c