mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-04-10 12:47:14 +00:00
Merge pull request #322216 from Pandapip1/patch-3
services/localtimed: Allow configuring packages
This commit is contained in:
commit
f6fb5b4f20
@ -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";
|
||||||
|
Loading…
Reference in New Issue
Block a user