about summary refs log tree commit diff
path: root/pkgs/desktops
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2023-10-22 19:36:20 +0800
committerGitHub <noreply@github.com>2023-10-22 19:36:20 +0800
commit1ef792bc54f4fcb45ac20704ccb39010e169132a (patch)
tree7dd431e9b04e22ab0caf18398d9e74e729841f72 /pkgs/desktops
parent125f1d62320ce32aad5b0c8faec6bca35d441c89 (diff)
parentc7c6805a130e078f2c6cc9812fd37532aaee43a4 (diff)
Merge pull request #262172 from OPNA2608/fix/mate/indicator-applet_ayatana
mate.mate-indicator-applet: Use Ayatana indicators instead, fix new-s…
Diffstat (limited to 'pkgs/desktops')
-rw-r--r--pkgs/desktops/mate/mate-indicator-applet/default.nix12
1 files 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 7d0d1eec009f4..b6445151f594e 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; };