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

Add setup-hook to hicolor_icon_theme

Browse Source
This commit is contained in:
Luca Bruno 2015-02-24 10:51:46 +01:00
parent 7b531e2845
commit bf521d7b55
27 changed files with 28 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/applications/graphics/shotwell/default.nix
View File

@ -44,7 +44,6 @@ in stdenv.mkDerivation rec {
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \
--prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules"
rm $out/share/icons/hicolor/icon-theme.cache
'';

2
pkgs/data/icons/hicolor-icon-theme/default.nix
View File

@ -8,6 +8,8 @@ stdenv.mkDerivation rec {
sha256 = "01ilkizzal3wq2naaj84rqmd850aari1ahiw9vfis3a82n4h72x3";
};
setupHook = ./setup-hook.sh;
meta = {
description = "Default fallback theme used by implementations of the icon theme specification";
homepage = http://icon-theme.freedesktop.org/releases/;

20
pkgs/data/icons/hicolor-icon-theme/setup-hook.sh Normal file
View File

@ -0,0 +1,20 @@
# Populate XDG_ICON_DIRS
hicolorIconThemeHook() {
# where to find icon themes
if [ -d "$1/share/icons" ]; then
addToSearchPath XDG_ICON_DIRS $1/share
fi
}
envHooks+=(hicolorIconThemeHook)
# Remove icon cache
hicolorPreFixupPhase() {
rm -f $out/share/icons/hicolor/icon-theme.cache
rm -f $out/share/icons/HighContrast/icon-theme.cache
}
preFixupPhases="$preFixupPhases hicolorPreFixupPhase"

1
pkgs/desktops/gnome-3/3.12/apps/bijiben/default.nix
View File

@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/bijiben" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/file-roller/default.nix
View File

@ -22,7 +22,6 @@ stdenv.mkDerivation rec {
preFixup = ''
wrapProgram "$out/bin/file-roller" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/glade/default.nix
View File

@ -24,7 +24,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/glade" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/gnome-boxes/default.nix
View File

@ -34,7 +34,6 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--prefix PATH : "${mtools}/bin:${cdrkit}/bin:${libcdio}/bin"
done
rm "$out/share/icons/hicolor/icon-theme.cache"
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/gnome-clocks/default.nix
View File

@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/gnome-clocks" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/gnome-documents/default.nix
View File

@ -44,7 +44,6 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \
--run "if [ -z \"\$XDG_CACHE_DIR\" ]; then XDG_CACHE_DIR=\$HOME/.cache; fi; if [ -w \"\$XDG_CACHE_DIR/..\" ]; then mkdir -p \"\$XDG_CACHE_DIR/gnome-documents\"; fi"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix
View File

@ -32,8 +32,6 @@ stdenv.mkDerivation rec {
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
--prefix PYTHONPATH : "$PYTHONPATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/gnome-photos/default.nix
View File

@ -35,7 +35,6 @@ stdenv.mkDerivation rec {
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/apps/seahorse/default.nix
View File

@ -28,7 +28,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/seahorse" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/3.12/core/baobab/default.nix
View File

@ -25,8 +25,6 @@ stdenv.mkDerivation rec {
hicolor_icon_theme gnome3.gnome_icon_theme_symbolic ];
preFixup = ''
rm $out/share/icons/hicolor/icon-theme.cache
rm $out/share/icons/HighContrast/icon-theme.cache
wrapProgram "$out/bin/baobab" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"

1
pkgs/desktops/gnome-3/3.12/core/empathy/default.nix
View File

@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/3.12/core/eog/default.nix
View File

@ -19,8 +19,6 @@ stdenv.mkDerivation rec {
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${shared_mime_info}/share:${gnome3.gnome_icon_theme}/share:${gnome3.gtk}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/3.12/core/evince/default.nix
View File

@ -46,8 +46,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/evince" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${shared_mime_info}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
doCheck = false; # would need pythonPackages.dogTail, which is missing

2
pkgs/desktops/gnome-3/3.12/core/gnome-control-center/default.nix
View File

@ -47,8 +47,6 @@ stdenv.mkDerivation rec {
for i in $out/share/applications/*; do
substituteInPlace $i --replace "gnome-control-center" "$out/bin/gnome-control-center"
done
rm $out/share/icons/hicolor/icon-theme.cache
'';
patches = [ ./search_providers_dir.patch ];

1
pkgs/desktops/gnome-3/3.12/core/gnome-disk-utility/default.nix
View File

@ -29,7 +29,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/gnome-disks" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

4
pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme-symbolic/default.nix
View File

@ -16,7 +16,9 @@ stdenv.mkDerivation rec {
make -C src install
'';
buildInputs = [ pkgconfig iconnamingutils gtk gnome3.gnome_icon_theme ];
buildInputs = [ pkgconfig iconnamingutils gtk ];
propagatedBuildInputs = [ gnome3.gnome_icon_theme ];
meta = with stdenv.lib; {
platforms = platforms.linux;

6
pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/default.nix
View File

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk }:
{ stdenv, fetchurl, pkgconfig, intltool, iconnamingutils, gtk, hicolor_icon_theme }:
stdenv.mkDerivation rec {
name = "gnome-icon-theme-3.12.0";
@ -8,10 +8,10 @@ stdenv.mkDerivation rec {
sha256 = "359e720b9202d3aba8d477752c4cd11eced368182281d51ffd64c8572b4e503a";
};
setupHook = ./setup-hook.sh;
nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk ];
propagatedBuildInputs = [ hicolor_icon_theme ];
meta = with stdenv.lib; {
platforms = platforms.linux;
};

10
pkgs/desktops/gnome-3/3.12/core/gnome-icon-theme/setup-hook.sh
View File

@ -1,10 +0,0 @@
make_gtk_applications_find_icon_themes() {
# where to find icon themes
if [ -d "$1/share/icons" ]; then
addToSearchPath XDG_ICON_DIRS $1/share
fi
}
envHooks+=(make_gtk_applications_find_icon_themes)

1
pkgs/desktops/gnome-3/3.12/core/gnome-system-log/default.nix
View File

@ -25,7 +25,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/bin/gnome-system-log" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/core/gnome-user-share/default.nix
View File

@ -39,7 +39,6 @@ stdenv.mkDerivation rec {
wrapProgram "$out/libexec/gnome-user-share" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$out/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

2
pkgs/desktops/gnome-3/3.12/core/totem/default.nix
View File

@ -35,8 +35,6 @@ stdenv.mkDerivation rec {
--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \
--prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \
--prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = with stdenv.lib; {

1
pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix
View File

@ -32,7 +32,6 @@ stdenv.mkDerivation rec {
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:${gnome3.gnome_themes_standard}/share:$out/share:$GSETTINGS_SCHEMAS_PATH"
rm $out/share/icons/hicolor/icon-theme.cache
rm $out/share/gitg/icons/hicolor/icon-theme.cache
'';

2
pkgs/desktops/xfce/applications/ristretto.nix
View File

@ -24,8 +24,6 @@ stdenv.mkDerivation rec {
--prefix XDG_DATA_DIRS : "${hicolor_icon_theme}/share"
'';
preFixup = "rm $out/share/icons/hicolor/icon-theme.cache";
meta = {
homepage = "http://goodies.xfce.org/projects/applications/${p_name}";
description = "A fast and lightweight picture-viewer for the Xfce desktop environment";

2
pkgs/development/tools/misc/d-feet/default.nix
View File

@ -27,8 +27,6 @@ stdenv.mkDerivation rec {
--prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pygobject3})" \
--prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \
--prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$out/share"
rm $out/share/icons/hicolor/icon-theme.cache
'';
meta = {