me/guix
Archived
1
0
Fork 0
Code Activity

services: dbus: Honor the config's dbus package.

Browse source 
* 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.
This commit is contained in:
Ludovic Courtès 2015-10-21 23:37:02 +02:00
parent 5e3bfe9d01
commit 4a663ca4e8
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
gnu/services/dbus.scm
View file

@ -118,15 +118,17 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in
(execl prog))) (execl prog)))
(waitpid pid))))))) (waitpid pid)))))))
(define (dbus-dmd-service config) (define dbus-dmd-service
(list (dmd-service (match-lambda
(documentation "Run the D-Bus system daemon.") (($ <dbus-configuration> dbus)
(provision '(dbus-system)) (list (dmd-service
(requirement '(user-processes)) (documentation "Run the D-Bus system daemon.")
(start #~(make-forkexec-constructor (provision '(dbus-system))
(list (string-append #$dbus "/bin/dbus-daemon") (requirement '(user-processes))
"--nofork" "--system"))) (start #~(make-forkexec-constructor
(stop #~(make-kill-destructor))))) (list (string-append #$dbus "/bin/dbus-daemon")
"--nofork" "--system")))
(stop #~(make-kill-destructor)))))))
(define dbus-root-service-type (define dbus-root-service-type
(service-type (name 'dbus) (service-type (name 'dbus)