02/04: services: dbus: Include each service's "share/dbus-1/system.d".

[guix-commits]

civodul pushed a commit to branch master
in repository guix.

commit 33f9778bc83086837b99e5c5e99cd514cb0d154e
Author: Ludovic Courtès <address@hidden>
Date:   Fri Nov 1 23:29:06 2019 +0100

    services: dbus: Include each service's "share/dbus-1/system.d".
    
    Fixes <https://bugs.gnu.org/37911>.
    Reported by Jack Hill <address@hidden>.
    
    Sometime between 1.1.8 and 1.4.3, 'colord' moved had its
    'org.freedesktop.ColorManager.conf' file moved from
    "etc/dbus-1/system.d" to "share/dbus-1/system.d".  Adjust to this
    change.
    
    * gnu/services/dbus.scm (dbus-configuration-directory): Add an
    'includedir' directive for DIR/share/dbus-1/system.d.
---
 gnu/services/dbus.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 35d7ff3..fcdeb3b 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -100,6 +100,8 @@ includes the @code{etc/dbus-1/system.d} directories of each 
package listed in
             ,@(append-map (lambda (dir)
                             `((includedir
                                ,(string-append dir "/etc/dbus-1/system.d"))
+                              (includedir
+                               ,(string-append dir "/share/dbus-1/system.d"))
                               (servicedir       ;for '.service' files
                                ,(string-append dir "/share/dbus-1/services"))))
                           services)))