diff options
| author | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-02-13 17:16:28 -0600 |
|---|---|---|
| committer | Parnell Springmeyer <parnell@digitalmentat.com> | 2017-02-13 17:16:28 -0600 |
| commit | 9e36a58649199a16a15cba3c78966ab0538a6fd7 (patch) | |
| tree | 289d50ecf1068cfac80bdeabdd34d2d42ecbd755 /nixos/modules/services/system | |
| parent | 128bdac94fe8173845e162c61ddb83cb4b8ed8de (diff) | |
| parent | 486b9be579fc1f046671ddaf1157f084ba956bdd (diff) | |
| download | nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.tar nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.tar.gz nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.tar.bz2 nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.tar.lz nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.tar.xz nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.tar.zst nixpkgs-9e36a58649199a16a15cba3c78966ab0538a6fd7.zip | |
Merging against upstream master
Diffstat (limited to 'nixos/modules/services/system')
| -rw-r--r-- | nixos/modules/services/system/dbus.nix | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index fae5a55c5ce..33bc890a78c 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -20,8 +20,6 @@ let "<includedir>${d}/etc/dbus-1/session.d</includedir>" ])); - daemonArgs = "--address=systemd: --nofork --nopidfile --systemd-activation"; - configDir = pkgs.runCommand "dbus-conf" { preferLocalBuild = true; allowSubstitutes = false; @@ -29,11 +27,6 @@ let '' mkdir -p $out - cp ${pkgs.dbus.out}/share/dbus-1/{system,session}.conf $out - - # include by full path - sed -ri "s@/etc/dbus-1/(system|session)-@$out/\1-@" $out/{system,session}.conf - sed '${./dbus-system-local.conf.in}' \ -e 's,@servicehelper@,${config.security.wrapperDir}/dbus-daemon-launch-helper,g' \ -e 's,@extra@,${systemExtraxml},' \ @@ -95,6 +88,11 @@ in environment.systemPackages = [ pkgs.dbus.daemon pkgs.dbus ]; + environment.etc = singleton + { source = configDir; + target = "dbus-1"; + }; + users.extraUsers.messagebus = { uid = config.ids.uids.messagebus; description = "D-Bus system message bus daemon user"; @@ -124,10 +122,6 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; - serviceConfig.ExecStart = [ - "" # Default dbus.service has two entries, we need to override both. - "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/system.conf ${daemonArgs}" - ]; }; systemd.user = { @@ -135,18 +129,10 @@ in # Don't restart dbus-daemon. Bad things tend to happen if we do. reloadIfChanged = true; restartTriggers = [ configDir ]; - serviceConfig.ExecStart = [ - "" # Default dbus.service has two entries, we need to override both. - "${lib.getBin pkgs.dbus}/bin/dbus-daemon --config-file=/run/current-system/dbus/session.conf ${daemonArgs}" - ]; }; sockets.dbus.wantedBy = mkIf cfg.socketActivated [ "sockets.target" ]; }; environment.pathsToLink = [ "/etc/dbus-1" "/share/dbus-1" ]; - - system.extraSystemBuilderCmds = '' - ln -s ${configDir} $out/dbus - ''; }; } |