ambroisie/nix-config
ambroisie/nix-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

treewide: use 'lib.getExe' when possible

Browse source 
Don't use it in wireguard to keep it consistent, as only half the
commands could use it.
This commit is contained in:
Bruno BELANYI 2023-07-23 18:58:40 +01:00
parent 8f818b8611
commit 9f7472222c
12 changed files with 16 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/services/drone/runner-docker/default.nix
View file

@ -2,7 +2,6 @@
let
cfg = config.my.services.drone;
hasRunner = (name: builtins.elem name cfg.runners);
dockerPkg = pkgs.drone-runner-docker;
in
{
config = lib.mkIf (cfg.enable && hasRunner "docker") {
@ -25,7 +24,7 @@ in
EnvironmentFile = [
cfg.sharedSecretFile
];
ExecStart = "${dockerPkg}/bin/drone-runner-docker";
ExecStart = lib.getExe pkgs.drone-runner-docker;
User = "drone-runner-docker";
Group = "drone-runner-docker";
};

3
modules/services/drone/runner-exec/default.nix
View file

@ -2,7 +2,6 @@
let
cfg = config.my.services.drone;
hasRunner = (name: builtins.elem name cfg.runners);
execPkg = pkgs.drone-runner-exec;
in
{
config = lib.mkIf (cfg.enable && hasRunner "exec") {
@ -53,7 +52,7 @@ in
EnvironmentFile = [
cfg.sharedSecretFile
];
ExecStart = "${execPkg}/bin/drone-runner-exec";
ExecStart = lib.getExe pkgs.drone-runner-exec;
User = "drone-runner-exec";
Group = "drone-runner-exec";
};