movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge pull request #322216 from Pandapip1/patch-3

Browse source 
services/localtimed: Allow configuring packages
This commit is contained in:
Sandro 2024-06-27 12:58:20 +02:00 • committed by GitHub
commit f6fb5b4f20
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/modules/services/system/localtimed.nix
View file

@ -18,6 +18,8 @@ in {
geoclue2 to determine the current location. geoclue2 to determine the current location.
''; '';
}; };
package = mkPackageOption pkgs "localtime" { };
geoclue2Package = mkPackageOption pkgs "geoclue2-with-demo-agent" { };
}; };
}; };
@ -29,14 +31,14 @@ in {
}; };
# Install the polkit rules. # Install the polkit rules.
environment.systemPackages = [ pkgs.localtime ]; environment.systemPackages = [ cfg.package ];
systemd.services.localtimed = { systemd.services.localtimed = {
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
partOf = [ "localtimed-geoclue-agent.service" ]; partOf = [ "localtimed-geoclue-agent.service" ];
after = [ "localtimed-geoclue-agent.service" ]; after = [ "localtimed-geoclue-agent.service" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.localtime}/bin/localtimed"; ExecStart = "${cfg.package}/bin/localtimed";
Restart = "on-failure"; Restart = "on-failure";
Type = "exec"; Type = "exec";
User = "localtimed"; User = "localtimed";
@ -48,7 +50,7 @@ in {
partOf = [ "geoclue.service" ]; partOf = [ "geoclue.service" ];
after = [ "geoclue.service" ]; after = [ "geoclue.service" ];
serviceConfig = { serviceConfig = {
ExecStart = "${pkgs.geoclue2-with-demo-agent}/libexec/geoclue-2.0/demos/agent"; ExecStart = "${cfg.geoclue2Package}/libexec/geoclue-2.0/demos/agent";
Restart = "on-failure"; Restart = "on-failure";
Type = "exec"; Type = "exec";
User = "localtimed"; User = "localtimed";