summary refs log tree commit diff
path: root/nixos
diff options
context:
space:
mode:
authorWout Mertens <Wout.Mertens@gmail.com>2016-06-28 09:50:16 +0200
committerGitHub <noreply@github.com>2016-06-28 09:50:16 +0200
commit69df7b63ff6b20390fa177df6ed6357f192e34eb (patch)
tree58607af8d0e080862794e89b52eca29564868d23 /nixos
parentde6977ffe3f987cc6149af3546765c24e2bf3894 (diff)
parent36c7c50512aa9af1284dfd93876fe2568801dfe3 (diff)
downloadnixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.tar
nixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.tar.gz
nixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.tar.bz2
nixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.tar.lz
nixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.tar.xz
nixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.tar.zst
nixlib-69df7b63ff6b20390fa177df6ed6357f192e34eb.zip
Merge pull request #16405 from philandstuff/better-dbus-services-packages-docstring
services.dbus module: more complete docstring
Diffstat (limited to 'nixos')
-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>
         '';
       };