diff options
author | 宋文武 <iyzsong@gmail.com> | 2016-03-06 11:31:35 +0800 |
---|---|---|
committer | 宋文武 <iyzsong@gmail.com> | 2016-03-06 11:31:35 +0800 |
commit | 2a8b3b4e221f2e5e9e2b8718ab776262ec8facce (patch) | |
tree | 993d7cce6f45d7c6215c172b5219e26062e605e3 /gnu/services | |
parent | 3b698589d25a2d491ff6bc154d78af4566c85f84 (diff) | |
download | patches-2a8b3b4e221f2e5e9e2b8718ab776262ec8facce.tar patches-2a8b3b4e221f2e5e9e2b8718ab776262ec8facce.tar.gz |
gnu: dbus: Merge with dbus/activation.
* gnu/packages/glib.scm (dbus): Apply patch.
(dbus/activation): Remove.
* gnu/services/dbus.scm: Use 'dbus' instead of 'dbus/activation'.
Diffstat (limited to 'gnu/services')
-rw-r--r-- | gnu/services/dbus.scm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 88a840a4b5..cd1b5f4b8a 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -21,7 +21,7 @@ #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu system shadow) - #:use-module ((gnu packages glib) #:select (dbus/activation)) + #:use-module ((gnu packages glib) #:select (dbus)) #:use-module (gnu packages admin) #:use-module (guix gexp) #:use-module (guix records) @@ -38,7 +38,7 @@ dbus-configuration make-dbus-configuration dbus-configuration? (dbus dbus-configuration-dbus ;<package> - (default dbus/activation)) + (default dbus)) (services dbus-configuration-services ;list of <package> (default '()))) @@ -198,7 +198,7 @@ includes the @code{etc/dbus-1/system.d} directories of each package listed in (append (dbus-configuration-services config) services))))))) -(define* (dbus-service #:key (dbus dbus/activation) (services '())) +(define* (dbus-service #:key (dbus dbus) (services '())) "Return a service that runs the \"system bus\", using @var{dbus}, with support for @var{services}. |