From 9ceb05adc029900e9f4e0452dc0955e52c5ddef2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 23 Feb 2020 21:55:49 -0300 Subject: [PATCH 1/3] mate.mate-themes: 3.22.20 -> 3.22.21 --- pkgs/desktops/mate/mate-themes/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index b2a0eea6d5e..d14bcd72837 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate, gtk2, gtk3, +{ stdenv, fetchurl, pkgconfig, intltool, mate-icon-theme, gtk2, gtk3, gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { pname = "mate-themes"; - version = "3.22.20"; + version = "3.22.21"; src = fetchurl { url = "https://pub.mate-desktop.org/releases/themes/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0c3dhf8p9nc2maky4g9xr04iil9wwbdkmhpzynlc6lfg4ksqq2bx"; + sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; }; nativeBuildInputs = [ pkgconfig intltool gtk3 ]; - buildInputs = [ mate.mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; + buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; propagatedUserEnvPkgs = [ gtk-engine-murrine ]; From e1791c1fcc0eecab6a4141d5a2a625c57dec2d34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 24 Feb 2020 08:17:09 -0300 Subject: [PATCH 2/3] mate.mate-themes: migrate from intltool to gettext --- pkgs/desktops/mate/mate-themes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index d14bcd72837..7c32656b970 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, mate-icon-theme, gtk2, gtk3, +{ stdenv, fetchurl, pkgconfig, gettext, mate-icon-theme, gtk2, gtk3, gtk_engines, gtk-engine-murrine, gdk-pixbuf, librsvg }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "051g2vq817g84yrqzf7hjcqr4xrghnw1rprjd6jf5mhhzmwcas6n"; }; - nativeBuildInputs = [ pkgconfig intltool gtk3 ]; + nativeBuildInputs = [ pkgconfig gettext gtk3 ]; buildInputs = [ mate-icon-theme gtk2 gtk_engines gdk-pixbuf librsvg ]; From de19630ba933b512d0a9b2772ed424e63bba9504 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Mon, 24 Feb 2020 08:19:03 -0300 Subject: [PATCH 3/3] mate.mate-themes: don't drop icon caches Set dontDropIconThemeCache so the gtk setup hook doesn't remove the icon cache. --- pkgs/desktops/mate/mate-themes/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/mate/mate-themes/default.nix b/pkgs/desktops/mate/mate-themes/default.nix index 7c32656b970..ffa902a2891 100644 --- a/pkgs/desktops/mate/mate-themes/default.nix +++ b/pkgs/desktops/mate/mate-themes/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + dontDropIconThemeCache = true; + postInstall = '' gtk-update-icon-cache "$out"/share/icons/ContrastHigh '';