treewide: rename gnome2.gnome_icon_theme package to use dashes
This commit is contained in:
parent
a396bc1a9b
commit
4d9a57bd76
|
@ -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.gnome2.gnome-icon-theme
|
||||||
pkgs.xorg.xcursorthemes
|
pkgs.xorg.xcursorthemes
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
|
@ -60,7 +60,7 @@ lib.makeScope pkgs.newScope (self: with self; {
|
||||||
|
|
||||||
gtksourceview = callPackage ./desktop/gtksourceview { };
|
gtksourceview = callPackage ./desktop/gtksourceview { };
|
||||||
|
|
||||||
gnome_icon_theme = callPackage ./desktop/gnome-icon-theme { };
|
gnome-icon-theme = callPackage ./desktop/gnome-icon-theme { };
|
||||||
|
|
||||||
vte = callPackage ./desktop/vte { };
|
vte = callPackage ./desktop/vte { };
|
||||||
|
|
||||||
|
@ -87,6 +87,7 @@ 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;
|
gnomeicontheme = self.gnome-icon-theme;
|
||||||
|
gnome_icon_theme = self.gnome-icon-theme;
|
||||||
gnome_common = gnome-common;
|
gnome_common = gnome-common;
|
||||||
})
|
})
|
||||||
|
|
|
@ -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 gnome2.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
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gtk3, intltool
|
{ 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 {
|
stdenv.mkDerivation rec {
|
||||||
version = "4.10.0";
|
version = "4.10.0";
|
||||||
|
@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
|
||||||
sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
|
sha256 = "1hq6asgb5n9q3ryx2vngr4jyi8lg65lzpnlgrgcwayiczcj68fya";
|
||||||
};
|
};
|
||||||
|
|
||||||
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome_icon_theme GConf ];
|
propagatedBuildInputs = [ gsettings-desktop-schemas gtk3 gnome-icon-theme GConf ];
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ intltool enchant isocodes ];
|
buildInputs = [ intltool enchant isocodes ];
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
|
{ stdenv, fetchurl, pkgconfig, gtk2, intltool,
|
||||||
GConf, enchant, isocodes, gnome_icon_theme }:
|
GConf, enchant, isocodes, gnome-icon-theme }:
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gtkhtml-3.32.2";
|
name = "gtkhtml-3.32.2";
|
||||||
|
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
|
||||||
patches = [ ./01_remove-disable-deprecated.patch ];
|
patches = [ ./01_remove-disable-deprecated.patch ];
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
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";
|
NIX_LDFLAGS = "-lgthread-2.0";
|
||||||
}
|
}
|
||||||
|
|
|
@ -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 {
|
stdenv.mkDerivation {
|
||||||
name = "libgnomeprintui-2.18.6";
|
name = "libgnomeprintui-2.18.6";
|
||||||
|
@ -9,5 +9,5 @@ stdenv.mkDerivation {
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome_icon_theme];
|
buildInputs = [ gtk2 gettext intltool libgnomecanvas libgnomeprint gnome-icon-theme];
|
||||||
}
|
}
|
||||||
|
|
|
@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
|
||||||
gtk2
|
gtk2
|
||||||
gst_all_1.gstreamer
|
gst_all_1.gstreamer
|
||||||
gnome2.GConf
|
gnome2.GConf
|
||||||
gnome2.gnome_icon_theme
|
gnome2.gnome-icon-theme
|
||||||
libnotify
|
libnotify
|
||||||
libxml2
|
libxml2
|
||||||
libunique
|
libunique
|
||||||
|
|
Loading…
Reference in a new issue