From ac41737f49402f8717a2f105a1910ffd9c6cfdb4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= <ludo@gnu.org>
Date: Mon, 26 Jan 2015 00:01:16 +0100
Subject: [PATCH] services: dbus: Set the search path for .service files.

* gnu/services/dbus.scm (dbus-configuration-directory)[services->sxml]:
  Produce a <servicedir> tag.
---
 gnu/services/dbus.scm | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index d97c54cc5d9..671dafa1943 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -40,15 +40,18 @@ (define (dbus-configuration-directory dbus services)
 @var{services}."
   (define build
     #~(begin
-        (use-modules (sxml simple))
+        (use-modules (sxml simple)
+                     (srfi srfi-1))
 
         (define (services->sxml services)
           ;; Return the SXML 'includedir' clauses for DIRS.
           `(busconfig
-            ,@(map (lambda (dir)
-                     `(includedir ,(string-append dir
-                                                  "/etc/dbus-1/system.d")))
-                   services)))
+            ,@(append-map (lambda (dir)
+                            `((includedir
+                               ,(string-append dir "/etc/dbus-1/system.d"))
+                              (servicedir         ;for '.service' files
+                               ,(string-append dir "/share/dbus-1/services"))))
+                          services)))
 
         (mkdir #$output)
         (copy-file (string-append #$dbus "/etc/dbus-1/system.conf")
-- 
GitLab