From 4d9a57bd76842e9a53f417cccc8072ee7ded7533 Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Fri, 3 Apr 2020 23:15:14 -0300 Subject: treewide: rename gnome2.gnome_icon_theme package to use dashes --- pkgs/tools/misc/alarm-clock-applet/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/tools/misc') diff --git a/pkgs/tools/misc/alarm-clock-applet/default.nix b/pkgs/tools/misc/alarm-clock-applet/default.nix index 7b869d66d1c3..ae9c88c0a6f6 100644 --- a/pkgs/tools/misc/alarm-clock-applet/default.nix +++ b/pkgs/tools/misc/alarm-clock-applet/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { gtk2 gst_all_1.gstreamer gnome2.GConf - gnome2.gnome_icon_theme + gnome2.gnome-icon-theme libnotify libxml2 libunique -- cgit 1.4.1 From 737586bf4fcd93a3c20ad9056fe0630dd76f10cc Mon Sep 17 00:00:00 2001 From: José Romildo Malaquias Date: Sun, 5 Apr 2020 22:01:34 -0300 Subject: gnome2.gnome-icon-theme: move to pkgs/data/icons --- .../x11/desktop-managers/enlightenment.nix | 2 +- pkgs/data/icons/gnome-icon-theme/default.nix | 33 ++++++++++++++++++++++ pkgs/desktops/gnome-2/default.nix | 5 ++-- .../gnome-2/desktop/gnome-icon-theme/default.nix | 33 ---------------------- .../gnome-2/desktop/mail-notification/default.nix | 4 +-- pkgs/tools/misc/alarm-clock-applet/default.nix | 3 +- pkgs/top-level/all-packages.nix | 2 ++ 7 files changed, 42 insertions(+), 40 deletions(-) create mode 100644 pkgs/data/icons/gnome-icon-theme/default.nix delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix (limited to 'pkgs/tools/misc') diff --git a/nixos/modules/services/x11/desktop-managers/enlightenment.nix b/nixos/modules/services/x11/desktop-managers/enlightenment.nix index e9841edc9fa6..32c9a40e535c 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/data/icons/gnome-icon-theme/default.nix b/pkgs/data/icons/gnome-icon-theme/default.nix new file mode 100644 index 000000000000..30dacbae740d --- /dev/null +++ b/pkgs/data/icons/gnome-icon-theme/default.nix @@ -0,0 +1,33 @@ +{ 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/default.nix b/pkgs/desktops/gnome-2/default.nix index f1822385f0f6..4212fa68bd4a 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 30dacbae740d..000000000000 --- 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 bce45c66b6f2..5a81c1bcb1ae 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 ae9c88c0a6f6..c92c0821092c 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 3bbbb74c2b7b..d2e6ef032ecd 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 { }; -- cgit 1.4.1