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

This commit is contained in:
José Romildo Malaquias 2020-04-05 22:01:34 -03:00
parent 4d9a57bd76
commit 737586bf4f
6 changed files with 9 additions and 7 deletions

View file

@ -38,7 +38,7 @@ in
pkgs.gtk2 # To get GTK's themes. pkgs.gtk2 # To get GTK's themes.
pkgs.tango-icon-theme pkgs.tango-icon-theme
pkgs.gnome2.gnome-icon-theme pkgs.gnome-icon-theme
pkgs.xorg.xcursorthemes pkgs.xorg.xcursorthemes
]; ];

View file

@ -60,8 +60,6 @@ lib.makeScope pkgs.newScope (self: with self; {
gtksourceview = callPackage ./desktop/gtksourceview { }; gtksourceview = callPackage ./desktop/gtksourceview { };
gnome-icon-theme = callPackage ./desktop/gnome-icon-theme { };
vte = callPackage ./desktop/vte { }; vte = callPackage ./desktop/vte { };
#### BINDINGS #### BINDINGS
@ -87,7 +85,8 @@ lib.makeScope pkgs.newScope (self: with self; {
startup_notification = pkgs.libstartup_notification; startup_notification = pkgs.libstartup_notification;
startupnotification = pkgs.libstartup_notification; startupnotification = pkgs.libstartup_notification;
gnomedocutils = pkgs.gnome-doc-utils; gnomedocutils = pkgs.gnome-doc-utils;
gnomeicontheme = self.gnome-icon-theme; gnome-icon-theme = pkgs.gnome-icon-theme;
gnome_icon_theme = self.gnome-icon-theme; gnome_icon_theme = self.gnome-icon-theme;
gnomeicontheme = self.gnome-icon-theme;
gnome_common = gnome-common; gnome_common = gnome-common;
}) })

View file

@ -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 { stdenv.mkDerivation rec {
rev = "9ae8768"; rev = "9ae8768";
@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
}; };
nativeBuildInputs = [ pkgconfig ]; 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 = '' prePatch = ''
sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c

View file

@ -8,6 +8,7 @@
, gtk2 , gtk2
, gst_all_1 , gst_all_1
, gnome2 , gnome2
, gnome-icon-theme
, libnotify , libnotify
, libxml2 , libxml2
, libunique , libunique
@ -46,7 +47,7 @@ stdenv.mkDerivation rec {
gtk2 gtk2
gst_all_1.gstreamer gst_all_1.gstreamer
gnome2.GConf gnome2.GConf
gnome2.gnome-icon-theme gnome-icon-theme
libnotify libnotify
libxml2 libxml2
libunique libunique

View file

@ -17812,6 +17812,8 @@ in
gnome-breeze = callPackage ../data/themes/gnome-breeze { }; gnome-breeze = callPackage ../data/themes/gnome-breeze { };
gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { };
go-font = callPackage ../data/fonts/go-font { }; go-font = callPackage ../data/fonts/go-font { };
greybird = callPackage ../data/themes/greybird { }; greybird = callPackage ../data/themes/greybird { };