From 4a663ca4e8b5ded9a3d92870fba8f2ebde22d75a Mon Sep 17 00:00:00 2001
From: Ludovic Courtès <ludo@gnu.org>
Date: Wed, 21 Oct 2015 23:37:02 +0200
Subject: services: dbus: Honor the config's dbus package.

* gnu/services/dbus.scm (dbus-dmd-service): Rewrite using 'match-lambda'
  so that the config's dbus package is used.  Fixes a regression
  introduced in 64643b9.
---
 gnu/services/dbus.scm | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

(limited to 'gnu/services')

diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm
index 1fa910af56..1d504a8309 100644
--- a/gnu/services/dbus.scm
+++ b/gnu/services/dbus.scm
@@ -118,15 +118,17 @@ (define (dbus-activation config)
                     (execl prog)))
                 (waitpid pid)))))))
 
-(define (dbus-dmd-service config)
-  (list (dmd-service
-         (documentation "Run the D-Bus system daemon.")
-         (provision '(dbus-system))
-         (requirement '(user-processes))
-         (start #~(make-forkexec-constructor
-                   (list (string-append #$dbus "/bin/dbus-daemon")
-                         "--nofork" "--system")))
-         (stop #~(make-kill-destructor)))))
+(define dbus-dmd-service
+  (match-lambda
+    (($ <dbus-configuration> dbus)
+     (list (dmd-service
+            (documentation "Run the D-Bus system daemon.")
+            (provision '(dbus-system))
+            (requirement '(user-processes))
+            (start #~(make-forkexec-constructor
+                      (list (string-append #$dbus "/bin/dbus-daemon")
+                            "--nofork" "--system")))
+            (stop #~(make-kill-destructor)))))))
 
 (define dbus-root-service-type
   (service-type (name 'dbus)
-- 
cgit v1.2.3