about summary refs log tree commit diff
path: root/pkgs/desktops/mate/mate-settings-daemon
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-15 23:04:17 -0400
committerworldofpeace <worldofpeace@protonmail.ch>2019-09-16 13:59:09 -0400
commit85eff86c3aa91743b73721783276c71666bd127e (patch)
treecf8fe4fdf1708c9ebe5af251be117058694b7706 /pkgs/desktops/mate/mate-settings-daemon
parentac0e914fdc56035af208149b1a18a715e5e5cece (diff)
mate.mate-settings-daemon: Move D-Bus conf file to share/dbus-1/system.d
Since D-Bus 1.9.18 configuration files installed by third-party should
go in share/dbus-1/system.d. The old location is for sysadmin overrides.
Diffstat (limited to 'pkgs/desktops/mate/mate-settings-daemon')
-rw-r--r--pkgs/desktops/mate/mate-settings-daemon/default.nix10
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/desktops/mate/mate-settings-daemon/default.nix b/pkgs/desktops/mate/mate-settings-daemon/default.nix
index 5ee995402ecdf..70092651702b1 100644
--- a/pkgs/desktops/mate/mate-settings-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-settings-daemon/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, pkgconfig, intltool, glib, dbus-glib, libxklavier,
   libcanberra-gtk3, libnotify, nss, polkit, gnome3, gtk3, mate,
   pulseaudioSupport ? stdenv.config.pulseaudio or true, libpulseaudio,
-  wrapGAppsHook }:
+  wrapGAppsHook, fetchpatch }:
 
 stdenv.mkDerivation rec {
   pname = "mate-settings-daemon";
@@ -12,6 +12,14 @@ stdenv.mkDerivation rec {
     sha256 = "0yr5v6b9hdk20j29smbw1k4fkyg82i5vlflmgly0vi5whgc74gym";
   };
 
+  patches = [
+    # Don't use etc/dbus-1/system.d
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/mate-desktop/mate-settings-daemon/pull/296.patch";
+      sha256 = "00dfn8h47zw3wr7yya82vvp19wsw51whn8jwgayn4hkjd161s9nm";
+    })
+  ];
+
   nativeBuildInputs = [
     pkgconfig
     intltool