diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 21:53:27 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-25 21:53:27 +0200 |
| commit | 57cfb787ef629d7f62fe4233349a98440d8c95e8 (patch) | |
| tree | 5d4b407378be89671a09bc974fce90d6a07f4a6e /pkgs/desktops/gnome-3/core | |
| parent | 89a34c1cce09cc1ed552a475a8f486e621da00d1 (diff) | |
| parent | 7280b5eef94ace2cdac0fb152505e888a48920df (diff) | |
| download | nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.gz nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.bz2 nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.lz nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.xz nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.tar.zst nixlib-57cfb787ef629d7f62fe4233349a98440d8c95e8.zip | |
Merge staging into staging-next
Diffstat (limited to 'pkgs/desktops/gnome-3/core')
| -rw-r--r-- | pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index 6eafa874b836..827fd1cd96a7 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool iconnamingutils gtk3 ]; + dontDropIconThemeCache = true; + # remove a tree of dirs with no files within postInstall = '' rm -rf "$out/locale" ''; diff --git a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix index 9cbac8c74277..fa2f4921fd91 100644 --- a/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix +++ b/pkgs/desktops/gnome-3/core/gnome-themes-extra/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, intltool, gtk3, gnome3, librsvg, pkgconfig, pango, atk, gtk2 -, gdk-pixbuf }: +, gdk-pixbuf, hicolor-icon-theme }: let pname = "gnome-themes-extra"; @@ -19,9 +19,12 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig intltool ]; - buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf gnome3.adwaita-icon-theme ]; + buildInputs = [ gtk3 librsvg pango atk gtk2 gdk-pixbuf ]; + propagatedBuildInputs = [ gnome3.adwaita-icon-theme hicolor-icon-theme ]; - postFixup = '' + dontDropIconThemeCache = true; + + postInstall = '' gtk-update-icon-cache "$out"/share/icons/HighContrast ''; |