summaryrefslogtreecommitdiffstats
path: root/nixos/modules/services/system/dbus.nix
diff options
context:
space:
mode:
Diffstat (limited to 'nixos/modules/services/system/dbus.nix')
-rw-r--r--nixos/modules/services/system/dbus.nix16
1 files changed, 7 insertions, 9 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix
index 4a60fec1ca80..d9dd26f0f189 100644
--- a/nixos/modules/services/system/dbus.nix
+++ b/nixos/modules/services/system/dbus.nix
@@ -19,6 +19,12 @@ in
{
+ imports = [
+ (mkRemovedOptionModule
+ [ "services" "dbus" "socketActivated" ]
+ "The user D-Bus session is now always socket activated and this option can safely be removed.")
+ ];
+
###### interface
options = {
@@ -51,14 +57,6 @@ in
<filename><replaceable>pkg</replaceable>/share/dbus-1/services</filename>
'';
};
-
- socketActivated = mkOption {
- type = types.bool;
- default = false;
- description = ''
- Make the user instance socket activated.
- '';
- };
};
};
@@ -108,7 +106,7 @@ in
reloadIfChanged = true;
restartTriggers = [ configDir ];
};
- sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ];
+ sockets.dbus.wantedBy = [ "sockets.target" ];
};
environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ];