diff options
author | Robin Gloster <mail@glob.in> | 2016-04-18 13:00:40 +0000 |
---|---|---|
committer | Robin Gloster <mail@glob.in> | 2016-04-18 13:49:22 +0000 |
commit | d020caa5b2eca90ea051403fbb4c52b99ee071b9 (patch) | |
tree | ba44ef1e784bca89e0df6b249956fd035b1d86e3 /nixos/modules/services/system/dbus.nix | |
parent | 3e68106afd95df012ddb548575f0133681687a90 (diff) | |
parent | 0729f606973870c03d21bb2f21b70d91216943ca (diff) |
Merge remote-tracking branch 'upstream/master' into hardened-stdenv
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
-rw-r--r-- | nixos/modules/services/system/dbus.nix | 26 |
1 files changed, 1 insertions, 25 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index ba34eb25169cc..2e29ef6a8f537 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -121,7 +121,7 @@ in security.setuidOwners = singleton { program = "dbus-daemon-launch-helper"; - source = "${pkgs.dbus_daemon}/libexec/dbus-daemon-launch-helper"; + source = "${pkgs.dbus_daemon.lib}/libexec/dbus-daemon-launch-helper"; owner = "root"; group = "messagebus"; setuid = true; @@ -139,30 +139,6 @@ in systemd.services.dbus.restartTriggers = [ configDir ]; - systemd.user = { - services.dbus = { - description = "D-Bus User Message Bus"; - requires = [ "dbus.socket" ]; - # NixOS doesn't support "Also" so we pull it in manually - # As the .service is supposed to come up at the same time as - # the .socket, we use basic.target instead of default.target - wantedBy = [ "basic.target" ]; - serviceConfig = { - ExecStart = "${pkgs.dbus_daemon}/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation"; - ExecReload = "${pkgs.dbus_daemon}/bin/dbus-send --print-reply --session --type=method_call --dest=org.freedesktop.DBus / org.freedesktop.DBus.ReloadConfig"; - }; - }; - - sockets.dbus = { - description = "D-Bus User Message Bus Socket"; - socketConfig = { - ListenStream = "%t/bus"; - ExecStartPost = "-${config.systemd.package}/bin/systemctl --user set-environment DBUS_SESSION_BUS_ADDRESS=unix:path=%t/bus"; - }; - wantedBy = [ "sockets.target" ]; - }; - }; - environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; }; |