diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2020-04-05 22:01:34 -0300 |
---|---|---|
committer | José Romildo Malaquias <malaquias@gmail.com> | 2020-04-05 22:14:23 -0300 |
commit | 737586bf4fcd93a3c20ad9056fe0630dd76f10cc (patch) | |
tree | e9536ee3756ef0020643e7045ca7dc5de456efc9 | |
parent | 4d9a57bd76842e9a53f417cccc8072ee7ded7533 (diff) | |
download | nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.tar nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.tar.gz nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.tar.bz2 nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.tar.lz nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.tar.xz nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.tar.zst nixpkgs-737586bf4fcd93a3c20ad9056fe0630dd76f10cc.zip |
gnome2.gnome-icon-theme: move to pkgs/data/icons
-rw-r--r-- | nixos/modules/services/x11/desktop-managers/enlightenment.nix | 2 | ||||
-rw-r--r-- | pkgs/data/icons/gnome-icon-theme/default.nix (renamed from pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix) | 0 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/default.nix | 5 | ||||
-rw-r--r-- | pkgs/desktops/gnome-2/desktop/mail-notification/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/alarm-clock-applet/default.nix | 3 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
6 files changed, 9 insertions, 7 deletions
diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index e9841edc9fa..32c9a40e535 100644 --- a/nixos/modules/services/x11/desktop-managers/enlightenment.nix +++ b/nixos/modules/services/x11/desktop-managers/enlightenment.nix @@ -38,7 +38,7 @@ in pkgs.gtk2 # To get GTK's themes. pkgs.tango-icon-theme - pkgs.gnome2.gnome-icon-theme + pkgs.gnome-icon-theme pkgs.xorg.xcursorthemes ]; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix index 30dacbae740..30dacbae740 100644 --- a/pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix +++ b/pkgs/data/icons/gnome-icon-theme/default.nix 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/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 diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index ae9c88c0a6f..c92c0821092 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -8,6 +8,7 @@ , gtk2 , gst_all_1 , gnome2 +, gnome-icon-theme , libnotify , libxml2 , libunique @@ -46,7 +47,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome-icon-theme + gnome-icon-theme libnotify libxml2 libunique diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bbbb74c2b7..d2e6ef032ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17812,6 +17812,8 @@ in gnome-breeze = callPackage ../data/themes/gnome-breeze { }; + gnome-icon-theme = callPackage ../data/icons/gnome-icon-theme { }; + go-font = callPackage ../data/fonts/go-font { }; greybird = callPackage ../data/themes/greybird { }; |