Merge pull request #158238 from rnhmjoj/pr-fix-connman

nixos/connman: fix evaluation
This commit is contained in:
Benjamin Hipple
2022-02-05 11:37:41 -05:00
committed by GitHub

View File

@@ -127,7 +127,7 @@ in {
description = "ConnMan VPN service"; description = "ConnMan VPN service";
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
after = [ "syslog.target" ]; after = [ "syslog.target" ];
before = [ "connman" ]; before = [ "connman.service" ];
serviceConfig = { serviceConfig = {
Type = "dbus"; Type = "dbus";
BusName = "net.connman.vpn"; BusName = "net.connman.vpn";
@@ -140,7 +140,7 @@ in {
description = "D-BUS Service"; description = "D-BUS Service";
serviceConfig = { serviceConfig = {
Name = "net.connman.vpn"; Name = "net.connman.vpn";
before = [ "connman" ]; before = [ "connman.service" ];
ExecStart = "${cfg.package}/sbin/connman-vpnd -n"; ExecStart = "${cfg.package}/sbin/connman-vpnd -n";
User = "root"; User = "root";
SystemdService = "connman-vpn.service"; SystemdService = "connman-vpn.service";