diff options
Diffstat (limited to 'nixpkgs/pkgs/data/icons')
16 files changed, 105 insertions, 29 deletions
diff --git a/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix index 6529e5c571c..b0a8a05fc68 100644 --- a/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postFixup = "gtk-update-icon-cache $out/share/icons/Arc"; meta = with stdenv.lib; { diff --git a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 4b99d1c15bc..221974c7941 100644 --- a/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "00sk6sv0kkfb3q0jqwcllzawi30rw8nfkkfn5l1qwqha48izw3r4"; }; - nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 hicolor-icon-theme ]; + nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; postPatch = '' substituteInPlace svgtopng/Makefile --replace "-O0" "-O" diff --git a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix index c15e0f4e551..efce0a16e13 100644 --- a/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon }: +{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -14,6 +14,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' patchShebangs meson/post_install.py ''; diff --git a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix index 99488a26f2b..96bd4031150 100644 --- a/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme diff --git a/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index 29306cb316a..f07bab4b269 100644 --- a/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/nixpkgs/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -1,21 +1,13 @@ +# shellcheck shell=bash + # Populate XDG_ICON_DIRS hicolorIconThemeHook() { # where to find icon themes if [ -d "$1/share/icons" ]; then - addToSearchPath XDG_ICON_DIRS $1/share + addToSearchPath XDG_ICON_DIRS "$1/share" fi - } # I think this is meant to be a runtime dep -addEnvHooks "$hostOffset" 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" - +addEnvHooks "${hostOffset:?}" hicolorIconThemeHook diff --git a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix index f7015621853..f48c3cbf3f7 100644 --- a/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/nixpkgs/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + installPhase = '' mkdir -p $out/share/icons mv Obsidian* $out/share/icons diff --git a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix index a623af20604..20bc8dc0a58 100644 --- a/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/maia-icon-theme/default.nix @@ -21,10 +21,12 @@ stdenv.mkDerivation { kdeFrameworks.kwindowsystem ]; - buildInputs = [ + propagatedBuildInputs = [ hicolor-icon-theme ]; + dontDropIconThemeCache = true; + postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme diff --git a/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix index 83c4b19472a..539dfaa2d10 100644 --- a/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/moka-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, faba-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "moka-icon-theme"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' patchShebangs meson/post_install.py ''; diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index 3a461e993d1..5658f20c744 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 numix-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + installPhase = '' install -dm 755 $out/share/icons cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 31ef15d40f7..76176f9ad04 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 numix-icon-theme ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + installPhase = '' mkdir -p $out/share/icons cp -a Numix-Square{,-Light} $out/share/icons/ diff --git a/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix index da6556c6060..d3bcdb12d3d 100644 --- a/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/numix-icon-theme/default.nix @@ -11,7 +11,13 @@ stdenv.mkDerivation rec { sha256 = "0pn3x0mmsph777lwhg890ck366p31bjl3755h4pv161ym08d4z9w"; }; - nativeBuildInputs = [ gtk3 hicolor-icon-theme ]; + nativeBuildInputs = [ gtk3 ]; + + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons diff --git a/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix index 5359b2229f3..477960972a7 100644 --- a/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3 }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja gtk3 python3 ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' patchShebangs meson/post_install.py ''; diff --git a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix index c1959124c36..dbe3ee201f4 100644 --- a/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,18 +1,24 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20190919"; + version = "20191009"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "1pykrvh232b12wlhc56yd992vl4p3j2ap21mhhcwyxml06riwvki"; + sha256 = "1ljbaq0c6rhvfwj5q2kvd6rxbjykb0sbgcpjrxrzpdy08zr1kdvd"; }; nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + installPhase = '' mkdir -p $out/share/icons mv {,e}Papirus* $out/share/icons diff --git a/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix index d38f6485f13..a4a7237f974 100644 --- a/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix +++ b/nixpkgs/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg -, gtk/*any version*/ +, gtk/*any version*/, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -15,6 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + configureFlags = [ "--enable-png-creation" ]; postInstall = '''${gtk.out}/bin/gtk-update-icon-cache' "$out/share/icons/Tango" ''; diff --git a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix index c4a8fd44a61..f271d7a44e6 100644 --- a/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix +++ b/nixpkgs/pkgs/data/icons/vanilla-dmz/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchzip, xorg }: +{ stdenv, lib, fetchzip, xorg, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "vanilla-dmz"; @@ -8,6 +8,10 @@ stdenv.mkDerivation rec { sha256 = "1l0c0svk7dy0d7icg7j2181wdn3fvks5gmyqnvjk749ppy5ks8mj"; }; buildInputs = [ xorg.xcursorgen ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + dontDropIconThemeCache = true; buildPhase = '' cd DMZ-White/pngs; ./make.sh; cd - cd DMZ-Black/pngs; ./make.sh; cd - diff --git a/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix index 942f79ca6e4..0b28a02ba4d 100644 --- a/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix +++ b/nixpkgs/pkgs/data/icons/zafiro-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; @@ -13,6 +13,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + installPhase = '' mkdir -p $out/share/icons/Zafiro-icons cp -a * $out/share/icons/Zafiro-icons |