From c4dd81b81db8e908e1e00ec59d547d1d2a92d466 Mon Sep 17 00:00:00 2001 From: romildo Date: Fri, 1 Sep 2017 17:27:24 -0300 Subject: [PATCH] mate: remove icon cache --- nixos/modules/services/x11/desktop-managers/mate.nix | 5 +---- pkgs/desktops/mate/atril/default.nix | 3 ++- pkgs/desktops/mate/engrampa/default.nix | 3 ++- pkgs/desktops/mate/eom/default.nix | 3 ++- pkgs/desktops/mate/libmateweather/default.nix | 2 ++ pkgs/desktops/mate/mate-control-center/default.nix | 3 ++- pkgs/desktops/mate/mate-panel/default.nix | 3 ++- pkgs/desktops/mate/mate-session-manager/default.nix | 3 ++- 8 files changed, 15 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 1230d9cf534d..7a95ac6549d8 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -60,10 +60,7 @@ in ''; }; - environment.systemPackages = [ - pkgs.hicolor_icon_theme - pkgs.mate.mate-icon-theme - ] ++ + environment.systemPackages = pkgs.mate.basePackages ++ (removePackagesByName pkgs.mate.extraPackages diff --git a/pkgs/desktops/mate/atril/default.nix b/pkgs/desktops/mate/atril/default.nix index 089b54de15e4..5b02c6ad117f 100644 --- a/pkgs/desktops/mate/atril/default.nix +++ b/pkgs/desktops/mate/atril/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, gtk3, libxml2, libsecret, poppler, itstool, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "atril-${version}"; @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { libsecret libxml2 poppler + hicolor_icon_theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/engrampa/default.nix b/pkgs/desktops/mate/engrampa/default.nix index dea2bea5ee9b..026890829890 100644 --- a/pkgs/desktops/mate/engrampa/default.nix +++ b/pkgs/desktops/mate/engrampa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "engrampa-${version}"; @@ -22,6 +22,7 @@ stdenv.mkDerivation rec { libxml2 gnome3.gtk mate.caja + hicolor_icon_theme mate.mate-desktop ]; diff --git a/pkgs/desktops/mate/eom/default.nix b/pkgs/desktops/mate/eom/default.nix index 1c27958b0c97..c7651e1b5be8 100644 --- a/pkgs/desktops/mate/eom/default.nix +++ b/pkgs/desktops/mate/eom/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, exempi, lcms2, libexif, libjpeg, librsvg, libxml2, shared_mime_info, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "eom-${version}"; @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { pkgconfig intltool itstool + hicolor_icon_theme wrapGAppsHook ]; diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix index aafc0fa9ceba..4d7c9dd61d6d 100644 --- a/pkgs/desktops/mate/libmateweather/default.nix +++ b/pkgs/desktops/mate/libmateweather/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { "--enable-locations-compression" ]; + preFixup = "rm -f $out/share/icons/mate/icon-theme.cache"; + meta = with stdenv.lib; { description = "Library to access weather information from online services for MATE"; homepage = https://github.com/mate-desktop/libmateweather; diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix index 6586d0df0d93..740124999530 100644 --- a/pkgs/desktops/mate/mate-control-center/default.nix +++ b/pkgs/desktops/mate/mate-control-center/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, librsvg, desktop_file_utils, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, libxml2, dbus_glib, libxklavier, libcanberra_gtk3, librsvg, desktop_file_utils, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-control-center-${version}"; @@ -27,6 +27,7 @@ stdenv.mkDerivation rec { librsvg gnome3.gtk gnome3.dconf + hicolor_icon_theme mate.mate-desktop mate.libmatekbd mate.mate-menus diff --git a/pkgs/desktops/mate/mate-panel/default.nix b/pkgs/desktops/mate/mate-panel/default.nix index cc6fd6c363c4..d3e6f11fd947 100644 --- a/pkgs/desktops/mate/mate-panel/default.nix +++ b/pkgs/desktops/mate/mate-panel/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, glib, dbus_glib, libwnck3, librsvg, libxml2, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-panel-${version}"; @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { libwnck3 librsvg libxml2 + hicolor_icon_theme gnome3.gtk gnome3.dconf mate.libmateweather diff --git a/pkgs/desktops/mate/mate-session-manager/default.nix b/pkgs/desktops/mate/mate-session-manager/default.nix index 316104334ac8..48d2890388a7 100644 --- a/pkgs/desktops/mate/mate-session-manager/default.nix +++ b/pkgs/desktops/mate/mate-session-manager/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, wrapGAppsHook }: +{ stdenv, fetchurl, pkgconfig, intltool, itstool, dbus_glib, systemd, xtrans, xorg, gnome3, mate, hicolor_icon_theme, wrapGAppsHook }: stdenv.mkDerivation rec { name = "mate-session-manager-${version}"; @@ -21,6 +21,7 @@ stdenv.mkDerivation rec { dbus_glib systemd xtrans + hicolor_icon_theme xorg.libSM gnome3.gtk3 gnome3.gsettings_desktop_schemas