summary refs log tree commit diff
path: root/nixos/modules/services/system/dbus.nix
diff options
context:
space:
mode:
authorobadz <dav-github@odav.org>2016-04-14 12:38:36 +0100
committerobadz <dav-github@odav.org>2016-04-14 12:38:36 +0100
commit079e1c76cfeedbdd0610fc9b50cb9583a330e77e (patch)
tree1d046d713964b98a1b6a0ad1b5009b75e4624721 /nixos/modules/services/system/dbus.nix
parent9cfa2029dea9f72131e8c87cd460198fef7a716f (diff)
downloadnixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.tar
nixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.tar.gz
nixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.tar.bz2
nixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.tar.lz
nixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.tar.xz
nixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.tar.zst
nixpkgs-079e1c76cfeedbdd0610fc9b50cb9583a330e77e.zip
Revert "dbus nixos module: add units for systemd user session"
This reverts commit 83cb6ec399e067b0d111abc39381204d1796758f.

Was breaking: nix-build '<nixos/release.nix>' -A tests.xfce.x86_64-linux
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
-rw-r--r--nixos/modules/services/system/dbus.nix24
1 files changed, 0 insertions, 24 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 3fd1ae145ff..2e29ef6a8f5 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -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.out}/bin/dbus-daemon --session --address=systemd: --nofork --nopidfile --systemd-activation";
-          ExecReload = "${pkgs.dbus_daemon.out}/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" ];
 
   };