JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #84230 from romildo/upd.gnome-icon-theme

Browse Source 
gnome2.gnome_icon_theme: 2.91.93 -> 3.12.0
This commit is contained in:
José Romildo Malaquias 2020-04-05 22:42:58 -03:00 committed by GitHub
commit 9908785fa7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 49 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/modules/services/x11/desktop-managers/enlightenment.nix
View File

@ -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
];

33
pkgs/data/icons/gnome-icon-theme/default.nix Normal file
View File

@ -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 ];
};
}

6
pkgs/desktops/gnome-2/default.nix
View File

@ -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,6 +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;
})

20
pkgs/desktops/gnome-2/desktop/gnome-icon-theme/default.nix
View File

@ -1,20 +0,0 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk2 }:
stdenv.mkDerivation rec {
name = "gnome-icon-theme-2.91.93";
src = fetchurl {
#url = "mirror://gnome/sources/gnome-icon-theme/3.4/${name}.tar.xz";
url = "mirror://gnome/sources/gnome-icon-theme/2.91/${name}.tar.bz2";
sha256 = "cc7f15e54e2640697b58c26e74cc3f6ebadeb4ef6622bffe9c1e6874cc3478d6";
};
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk2 ];
# remove a tree of dirs with no files within
postInstall = '' rm -r "$out/share/locale" '';
meta = {
platforms = stdenv.lib.platforms.linux;
};
}

4
pkgs/desktops/gnome-2/desktop/mail-notification/default.nix
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 {
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

4
pkgs/desktops/gnome-2/platform/gtkhtml/4.x.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk3, intltool
, GConf, enchant, isocodes, gnome_icon_theme, gsettings-desktop-schemas }:
, GConf, enchant, isocodes, gnome-icon-theme, gsettings-desktop-schemas }:
stdenv.mkDerivation rec {
version = "4.10.0";
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
};
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ];
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ intltool enchant isocodes ];
}

4
pkgs/desktops/gnome-2/platform/gtkhtml/default.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
GConf, enchant, isocodes, gnome_icon_theme }:
GConf, enchant, isocodes, gnome-icon-theme }:
stdenv.mkDerivation rec {
name = "gtkhtml-3.32.2";
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
patches = [ ./01_remove-disable-deprecated.patch ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome_icon_theme ];
buildInputs = [ gtk2 intltool GConf enchant isocodes gnome-icon-theme ];
NIX_LDFLAGS = "-lgthread-2.0";
}

4
pkgs/desktops/gnome-2/platform/libgnomeprintui/default.nix
View File

@ -1,4 +1,4 @@
{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome_icon_theme}:
{stdenv, fetchurl, pkgconfig, gtk2, gettext, intltool, libgnomecanvas, libgnomeprint, gnome-icon-theme}:
stdenv.mkDerivation {
name = "libgnomeprintui-2.18.6";
@ -9,5 +9,5 @@ stdenv.mkDerivation {
};
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme];
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme];
}

3
pkgs/tools/misc/alarm-clock-applet/default.nix
View File

@ -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

2
pkgs/top-level/all-packages.nix
View File

@ -17753,6 +17753,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 { };