diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-04-27 19:35:17 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-27 19:35:17 +0200 |
commit | 16f031e8e7da6c6a6eccd66c90b82f62456e5b3d (patch) | |
tree | 89e84b27eec8307400dc41776ba6808bf79f2223 /pkgs | |
parent | 32e4d072a0d8d378d9c3a18a94541c1d320bad61 (diff) | |
parent | 57cfb787ef629d7f62fe4233349a98440d8c95e8 (diff) |
Merge pull request #86139 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs')
35 files changed, 253 insertions, 130 deletions
diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 54f0f744c04b..8b8dbef12ab4 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -21,7 +21,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.26.1"; + version = "2.26.2"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -33,7 +33,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0s03ix9j1h0yychkh1l1cgpr1l9lwzn3rprl08rk8ii5ix02i0l8"; + sha256 = "0j685w6pzkn926z5nf5r8fij4ziipvw4c9yb0wc577nzf4j16rbd"; }; outputs = [ "out" ]; @@ -335,6 +335,7 @@ stdenv.mkDerivation { homepage = "https://git-scm.com/"; description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2; + changelog = "https://raw.githubusercontent.com/git/git/${version}/Documentation/RelNotes/${version}.txt"; longDescription = '' Git, a popular distributed version control system designed to diff --git a/pkgs/data/icons/arc-icon-theme/default.nix b/pkgs/data/icons/arc-icon-theme/default.nix index a26064cdfa3b..ab80305d5285 100644 --- a/pkgs/data/icons/arc-icon-theme/default.nix +++ b/pkgs/data/icons/arc-icon-theme/default.nix @@ -1,20 +1,25 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, gnome3, moka-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { - name = "${package-name}-${version}"; - package-name = "arc-icon-theme"; + pname = "arc-icon-theme"; version = "2016-11-22"; src = fetchFromGitHub { owner = "horst3180"; - repo = package-name; + repo = pname; rev = "55a575386a412544c3ed2b5617a61f842ee4ec15"; sha256 = "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix index 3aebf09554c3..3a82c3132964 100644 --- a/pkgs/data/icons/elementary-xfce-icon-theme/default.nix +++ b/pkgs/data/icons/elementary-xfce-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, pkgconfig, gdk-pixbuf, optipng, librsvg, gtk3, pantheon, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "elementary-xfce-icon-theme"; @@ -11,9 +11,18 @@ stdenv.mkDerivation rec { sha256 = "1f6qvpzxz759znishmr4b22n540y18glv41wmy91r78sa4g6x4sh"; }; - nativeBuildInputs = [ pkgconfig gdk-pixbuf librsvg optipng gtk3 ]; + nativeBuildInputs = [ + pkgconfig + gdk-pixbuf + librsvg + optipng + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/faba-icon-theme/default.nix b/pkgs/data/icons/faba-icon-theme/default.nix index e1e070c58be7..9df47f8faa7c 100644 --- a/pkgs/data/icons/faba-icon-theme/default.nix +++ b/pkgs/data/icons/faba-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, python3, gtk3, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "${package-name}-${version}"; @@ -12,9 +12,16 @@ stdenv.mkDerivation rec { sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; }; - nativeBuildInputs = [ meson ninja python3 gtk3 pantheon.elementary-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + python3 + gtk3 + ]; propagatedBuildInputs = [ + pantheon.elementary-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/faba-mono-icons/default.nix b/pkgs/data/icons/faba-mono-icons/default.nix index 19d58eeff6f3..e403ba753ecc 100644 --- a/pkgs/data/icons/faba-mono-icons/default.nix +++ b/pkgs/data/icons/faba-mono-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, autoreconfHook, gtk3, moka-icon-theme, faba-icon-theme, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "faba-mono-icons"; @@ -11,15 +11,21 @@ stdenv.mkDerivation rec { sha256 = "0nisfl92y6hrbakp9qxi0ygayl6avkzrhwirg6854bwqjy2dvjv9"; }; - nativeBuildInputs = [ autoreconfHook gtk3 moka-icon-theme ]; + nativeBuildInputs = [ + autoreconfHook + gtk3 + ]; propagatedBuildInputs = [ + moka-icon-theme + faba-icon-theme + gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/flat-remix-icon-theme/default.nix b/pkgs/data/icons/flat-remix-icon-theme/default.nix index 90c14ef7d057..b0b115f096f2 100644 --- a/pkgs/data/icons/flat-remix-icon-theme/default.nix +++ b/pkgs/data/icons/flat-remix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub , gtk3 }: +{ stdenv, fetchFromGitHub , gtk3, breeze-icons, pantheon, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "flat-remix-icon-theme"; @@ -11,14 +11,23 @@ stdenv.mkDerivation rec { sha256 = "14n5wydhd5ifmsbj770s2qg2ksd3xa3m61qxydid6jq39k0lxbd8"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; + + propagatedBuildInputs = [ + breeze-icons + pantheon.elementary-icon-theme + gnome-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons mv Flat-Remix* $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done @@ -31,4 +40,4 @@ stdenv.mkDerivation rec { platforms = platforms.linux; maintainers = with maintainers; [ mschneider ]; }; -}
\ No newline at end of file +} diff --git a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh index f7c99418144b..0fd9bf85d831 100644 --- a/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh +++ b/pkgs/data/icons/hicolor-icon-theme/setup-hook.sh @@ -11,3 +11,43 @@ hicolorIconThemeHook() { # I think this is meant to be a runtime dep addEnvHooks "${targetOffset:?}" hicolorIconThemeHook + +# Make symbolic links of parent icon themes that are inherited in the +# icon themes installed by the package. +symlinkParentIconThemes() { + if [ -e $out/share/icons ]; then + echo Symlinking parent icon themes... + local theme + local theme_name + local inheritance + local parent + local parent_theme + local dir + local parent_path + for theme in $out/share/icons/*/index.theme; do + theme_name="${theme%/*}" + theme_name="${theme_name##*/}" + echo " theme: $theme_name" + inheritance=$(sed -rne 's,^Inherits=(.*)$,\1,p' $theme) + IFS=',' read -ra parent_themes <<< "$inheritance" + for parent_theme in "${parent_themes[@]}"; do + parent_path="" + if [ -e "$out/share/icons/$parent_theme" ]; then + parent_path="$(realpath $out/share/icons/$parent_theme)" + else + IFS=':' read -ra dirs <<< $XDG_ICON_DIRS + for parent_dir in "${dirs[@]}"; do + if [ -e "$parent_dir/icons/$parent_theme/index.theme" ]; then + parent_path=$(realpath "$parent_dir/icons/$parent_theme") + ln -s "$parent_path" "$out/share/icons/" + break + fi + done + fi + echo " parent: $parent_theme -> $parent_path" + done + done + fi +} + +preFixupHooks+=(symlinkParentIconThemes) diff --git a/pkgs/data/icons/iconpack-jade/default.nix b/pkgs/data/icons/iconpack-jade/default.nix index 1b42c1af6125..1bfa8092a322 100644 --- a/pkgs/data/icons/iconpack-jade/default.nix +++ b/pkgs/data/icons/iconpack-jade/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-jade"; @@ -13,16 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - cp -a Jade* $out/share/icons - ''; + mkdir -p $out/share/icons + cp -a Jade* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/iconpack-obsidian/default.nix b/pkgs/data/icons/iconpack-obsidian/default.nix index c954af9e83dc..ae8c127381b1 100644 --- a/pkgs/data/icons/iconpack-obsidian/default.nix +++ b/pkgs/data/icons/iconpack-obsidian/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "iconpack-obsidian"; @@ -13,16 +13,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent themes: Ambiant-MATE, Mint-X, Faenza-Dark, KFaenza dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv Obsidian* $out/share/icons - ''; + mkdir -p $out/share/icons + mv Obsidian* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix index fbde3a428c0f..ee539981fbca 100644 --- a/pkgs/data/icons/maia-icon-theme/default.nix +++ b/pkgs/data/icons/maia-icon-theme/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { dontDropIconThemeCache = true; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/moka-icon-theme/default.nix b/pkgs/data/icons/moka-icon-theme/default.nix index 33798f7b01d8..d481f2df8d6e 100644 --- a/pkgs/data/icons/moka-icon-theme/default.nix +++ b/pkgs/data/icons/moka-icon-theme/default.nix @@ -11,9 +11,15 @@ stdenv.mkDerivation rec { sha256 = "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 faba-icon-theme ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + faba-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index a22b97ec1e71..3c991cf1fc83 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' - install -dm 755 $out/share/icons - cp -dr --no-preserve='ownership' Numix-Circle{,-Light} $out/share/icons/ - ''; + runHook preInstall + + mkdir -p $out/share/icons + cp -a Numix-Circle{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/numix-icon-theme-square/default.nix b/pkgs/data/icons/numix-icon-theme-square/default.nix index 92a3ce9091a5..9cebdc331065 100644 --- a/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -13,18 +13,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - buildInputs = [ numix-icon-theme ]; - - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ numix-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' + runHook preInstall + mkdir -p $out/share/icons - cp -a Numix-Square{,-Light} $out/share/icons/ - ''; + cp -a Numix-Square{,-Light} $out/share/icons - postFixup = '' for panel in $out/share/icons/*/*/panel; do ln -sf $(realpath ${numix-icon-theme}/share/icons/Numix/16/$(readlink $panel)) $panel done @@ -32,6 +30,8 @@ stdenv.mkDerivation rec { for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done + + runHook postInstall ''; meta = with stdenv.lib; { diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix index 46c61d861a32..56bb2f3808fb 100644 --- a/pkgs/data/icons/numix-icon-theme/default.nix +++ b/pkgs/data/icons/numix-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "numix-icon-theme"; @@ -13,18 +13,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; dontDropIconThemeCache = true; installPhase = '' mkdir -p $out/share/icons cp -a Numix{,-Light} $out/share/icons/ - ''; - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/paper-icon-theme/default.nix b/pkgs/data/icons/paper-icon-theme/default.nix index 1531bdf2af83..585190a7b382 100644 --- a/pkgs/data/icons/paper-icon-theme/default.nix +++ b/pkgs/data/icons/paper-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, meson, ninja, gtk3, python3, gnome3, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "paper-icon-theme"; @@ -11,9 +11,16 @@ stdenv.mkDerivation rec { sha256 = "0x45zkjnmbz904df63ph06npbm3phpgck4xwyymx8r8jgrfplk6v"; }; - nativeBuildInputs = [ meson ninja gtk3 python3 ]; + nativeBuildInputs = [ + meson + ninja + gtk3 + python3 + ]; propagatedBuildInputs = [ + gnome3.adwaita-icon-theme + gnome-icon-theme hicolor-icon-theme ]; diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index d01410f28da5..b47c01d973eb 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, pantheon, breeze-icons, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-icon-theme"; @@ -11,18 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0qv4340avm5s0640r8aznbfwjzvm6k64840qggyg9jfcy6223pdy"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; - propagatedBuildInputs = [ hicolor-icon-theme ]; + propagatedBuildInputs = [ + pantheon.elementary-icon-theme + breeze-icons + gnome-icon-theme + hicolor-icon-theme + ]; dontDropIconThemeCache = true; installPhase = '' - mkdir -p $out/share/icons - mv {,e}Papirus* $out/share/icons - ''; + mkdir -p $out/share/icons + mv {,e}Papirus* $out/share/icons - postFixup = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/papirus-maia-icon-theme/default.nix b/pkgs/data/icons/papirus-maia-icon-theme/default.nix index a90182cc8d78..4cfe50d7836b 100644 --- a/pkgs/data/icons/papirus-maia-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-maia-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, gtk3 }: +{ stdenv, fetchFromGitHub, cmake, gtk3, breeze-icons, gnome-icon-theme, papirus-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "papirus-maia-icon-theme"; @@ -16,11 +16,20 @@ stdenv.mkDerivation rec { gtk3 ]; + propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + papirus-icon-theme + hicolor-icon-theme + ]; + + dontDropIconThemeCache = true; + postPatch = '' substituteInPlace CMakeLists.txt --replace /usr "$out" ''; - postFixup = '' + postInstall = '' for theme in $out/share/icons/*; do gtk-update-icon-cache $theme done diff --git a/pkgs/data/icons/qogir-icon-theme/default.nix b/pkgs/data/icons/qogir-icon-theme/default.nix index 641b3da883e8..fa52ad176d98 100644 --- a/pkgs/data/icons/qogir-icon-theme/default.nix +++ b/pkgs/data/icons/qogir-icon-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3 }: +{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "qogir-icon-theme"; @@ -13,6 +13,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gtk3 ]; + propagatedBuildInputs = [ hicolor-icon-theme ]; + dontDropIconThemeCache = true; installPhase = '' diff --git a/pkgs/data/icons/tango-icon-theme/default.nix b/pkgs/data/icons/tango-icon-theme/default.nix index fe749598495d..f1b59c2f5386 100644 --- a/pkgs/data/icons/tango-icon-theme/default.nix +++ b/pkgs/data/icons/tango-icon-theme/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, pkgconfig, iconnamingutils, imagemagick, librsvg -, gtk/*any version*/, hicolor-icon-theme +, gtk/*any version*/, gnome-icon-theme, hicolor-icon-theme }: stdenv.mkDerivation rec { @@ -14,10 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ intltool iconnamingutils imagemagick librsvg ]; - - propagatedBuildInputs = [ - hicolor-icon-theme - ]; + propagatedBuildInputs = [ gnome-icon-theme hicolor-icon-theme ]; + # still missing parent icon themes: cristalsvg dontDropIconThemeCache = true; diff --git a/pkgs/data/icons/zafiro-icons/default.nix b/pkgs/data/icons/zafiro-icons/default.nix index 5bd61b0866a4..a8dc4539a7dd 100644 --- a/pkgs/data/icons/zafiro-icons/default.nix +++ b/pkgs/data/icons/zafiro-icons/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, gtk3, hicolor-icon-theme }: +{ stdenv, fetchFromGitHub, gtk3, breeze-icons, gnome-icon-theme, numix-icon-theme, numix-icon-theme-circle, hicolor-icon-theme }: stdenv.mkDerivation rec { pname = "zafiro-icons"; @@ -11,10 +11,17 @@ stdenv.mkDerivation rec { sha256 = "05h8qm9izjbp8pnl9jpbw3y9sddhp0zmg94fm1k4d4hhdqnakqhv"; }; - nativeBuildInputs = [ gtk3 ]; + nativeBuildInputs = [ + gtk3 + ]; propagatedBuildInputs = [ + breeze-icons + gnome-icon-theme + numix-icon-theme + numix-icon-theme-circle hicolor-icon-theme + # still missing parent icon themes: Surfn ]; dontDropIconThemeCache = true; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 385f7afa3e4f..665452a91d85 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, sassc, pkg-config, glib, ninja, |