summary refs log tree commit diff
diff options
context:
space:
mode:
authorPeter Hoeg <peter@hoeg.com>2021-03-24 11:01:14 +0800
committerPeter Hoeg <peter@hoeg.com>2021-03-29 16:57:49 +0800
commit860e87d36363f51cfe5c4af2ffdd462e159dad31 (patch)
tree8c6484dceae09442d2bf1e71eb0e8edb26eac08d
parentdf285339a3e42c2dfa000fc954aaa37a2072f1da (diff)
downloadnixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.tar
nixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.tar.gz
nixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.tar.bz2
nixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.tar.lz
nixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.tar.xz
nixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.tar.zst
nixpkgs-860e87d36363f51cfe5c4af2ffdd462e159dad31.zip
nixos/geoclue2: do not start geoclue agent for system users
-rw-r--r--nixos/modules/services/desktops/geoclue2.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix
index 6702bd395a0..0dc0643afbc 100644
--- a/nixos/modules/services/desktops/geoclue2.nix
+++ b/nixos/modules/services/desktops/geoclue2.nix
@@ -188,7 +188,8 @@ in
 
     systemd.packages = [ package ];
 
-    # we cannot use DynamicUser as we need the the geoclue user to exist for the dbus policy to work
+    # we cannot use DynamicUser as we need the the geoclue user to exist for the
+    # dbus policy to work
     users = {
       users.geoclue = {
         isSystemUser = true;
@@ -217,6 +218,7 @@ in
         # we can't be part of a system service, and the agent should
         # be okay with the main service coming and going
         wantedBy = [ "default.target" ];
+        unitConfig.ConditionUser = "!@system";
         serviceConfig = {
           Type = "exec";
           ExecStart = "${package}/libexec/geoclue-2.0/demos/agent";