summary refs log tree commit diff
path: root/nixos/modules/services
diff options
context:
space:
mode:
authorPhilip Potter <philip.g.potter@gmail.com>2016-06-21 20:51:47 +0100
committerPhilip Potter <philip.g.potter@gmail.com>2016-06-28 08:24:32 +0100
commit36c7c50512aa9af1284dfd93876fe2568801dfe3 (patch)
treec9491dc3380296e2dcdfa45def4ef9a2cbf821dc /nixos/modules/services
parent9c5588e99f269a889739434c33421182e867b282 (diff)
downloadnixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.tar
nixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.tar.gz
nixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.tar.bz2
nixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.tar.lz
nixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.tar.xz
nixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.tar.zst
nixlib-36c7c50512aa9af1284dfd93876fe2568801dfe3.zip
services.dbus module: more complete docstring
The docstring for the `services.dbus.packages` configuration option only
mentioned one directory, but the implementation actually looked for DBus
config files in four separate places within the target packages.  This
commit updates the docstring to reflect the actual implementation
behaviour.
Diffstat (limited to 'nixos/modules/services')
-rw-r--r--nixos/modules/services/system/dbus.nix9
1 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 5583a1bcb3ab..8bcd6f01656d 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -65,10 +65,13 @@ in
         default = [ ];
         description = ''
           Packages whose D-Bus configuration files should be included in
-          the configuration of the D-Bus system-wide message bus.
-          Specifically, every file in
+          the configuration of the D-Bus system-wide or session-wide
+          message bus.  Specifically, files in the following directories
+          will be included into their respective DBus configuration paths:
           <filename><replaceable>pkg</replaceable>/etc/dbus-1/system.d</filename>
-          is included.
+          <filename><replaceable>pkg</replaceable>/share/dbus-1/system-services</filename>
+          <filename><replaceable>pkg</replaceable>/etc/dbus-1/session.d</filename>
+          <filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename>
         '';
       };