diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-12 17:24:53 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-12 17:24:53 -0600 |
commit | a83dc7e3314d84fe09cd2d4ef315aa20d0824e25 (patch) | |
tree | 27815566fef9776c38f0c6ad9b6a520e46840573 /pkgs/desktops/mate | |
parent | 964d01a5caa788425a4936f097bf7aa0ed62bb4b (diff) | |
parent | a49fbb6a059caca41a49da7c84e484b9bc17d8fb (diff) | |
download | nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.gz nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.bz2 nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.lz nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.xz nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.tar.zst nixpkgs-a83dc7e3314d84fe09cd2d4ef315aa20d0824e25.zip |
Merge pull request #47690 from romildo/fix.icon-cache
build GTK icon caches for some packages
Diffstat (limited to 'pkgs/desktops/mate')
-rw-r--r-- | pkgs/desktops/mate/mate-icon-theme-faenza/default.nix | 12 | ||||
-rw-r--r-- | pkgs/desktops/mate/mate-themes/default.nix | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix index 2d868d2e082..03f8c62c448 100644 --- a/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix +++ b/pkgs/desktops/mate/mate-icon-theme-faenza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mate, hicolor-icon-theme }: +{ stdenv, fetchurl, autoreconfHook, gtk3, mate, hicolor-icon-theme }: stdenv.mkDerivation rec { name = "mate-icon-theme-faenza-${version}"; @@ -9,10 +9,16 @@ stdenv.mkDerivation rec { sha256 = "000vr9cnbl2qlysf2gyg1lsjirqdzmwrnh6d3hyrsfc0r2vh4wna"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook gtk3 ]; buildInputs = [ mate.mate-icon-theme hicolor-icon-theme ]; - + + postInstall = '' + for theme in "$out"/share/icons/*; do + gtk-update-icon-cache "$theme" + done + ''; + meta = { description = "Faenza icon theme from MATE"; homepage = http://mate-desktop.org; diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 44d07231d2e..58feb32cfa8 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk_engines, - gtk-engine-murrine, gdk_pixbuf, librsvg }: +{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3, + gtk_engines, gtk-engine-murrine, gdk_pixbuf, librsvg }: stdenv.mkDerivation rec { name = "mate-themes-${version}"; @@ -10,12 +10,16 @@ stdenv.mkDerivation rec { sha256 = "0538bw8qismp16ymxbjk0ww7yjw1ch5v3f3d4vib3770xvgmmcfm"; }; - nativeBuildInputs = [ pkgconfig intltool ]; + nativeBuildInputs = [ pkgconfig intltool gtk3 ]; buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk_pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + postInstall = '' + gtk-update-icon-cache "$out"/share/icons/ContrastHigh + ''; + meta = { description = "A set of themes from MATE"; homepage = http://mate-desktop.org; |