From c7c6805a130e078f2c6cc9812fd37532aaee43a4 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 20 Oct 2023 02:10:07 +0200 Subject: [PATCH] mate.mate-indicator-applet: Use Ayatana indicators instead, fix new-style indicator finding --- pkgs/desktops/mate/mate-indicator-applet/default.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/mate/mate-indicator-applet/default.nix b/pkgs/desktops/mate/mate-indicator-applet/default.nix index 7d0d1eec009f..b6445151f594 100644 --- a/pkgs/desktops/mate/mate-indicator-applet/default.nix +++ b/pkgs/desktops/mate/mate-indicator-applet/default.nix @@ -4,7 +4,7 @@ , pkg-config , gettext , gtk3 -, libindicator-gtk3 +, libayatana-indicator , mate , hicolor-icon-theme , wrapGAppsHook @@ -20,6 +20,12 @@ stdenv.mkDerivation rec { sha256 = "144fh9f3lag2cqnmb6zxlh8k83ya8kha6rmd7r8gg3z5w3nzpyz4"; }; + postPatch = '' + # Find installed Unity & Ayatana (new-style) indicators + substituteInPlace src/applet-main.c \ + --replace '/usr/share' '/run/current-system/sw/share' + ''; + nativeBuildInputs = [ pkg-config gettext @@ -28,11 +34,13 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 - libindicator-gtk3 + libayatana-indicator mate.mate-panel hicolor-icon-theme ]; + configureFlags = [ "--with-ayatana-indicators" ]; + enableParallelBuilding = true; passthru.updateScript = mateUpdateScript { inherit pname; };