mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 14:41:17 +00:00
Merge pull request #133700 from poscat0x04/v2ray-add-package-option
nixos/v2ray: add an option for specifying v2ray package used in the systemd service
This commit is contained in:
commit
6a1c868a9d
|
@ -16,6 +16,15 @@ with lib;
|
|||
'';
|
||||
};
|
||||
|
||||
package = mkOption {
|
||||
type = types.package;
|
||||
default = pkgs.v2ray;
|
||||
defaultText = literalExpression "pkgs.v2ray";
|
||||
description = ''
|
||||
Which v2ray package to use.
|
||||
'';
|
||||
};
|
||||
|
||||
configFile = mkOption {
|
||||
type = types.nullOr types.str;
|
||||
default = null;
|
||||
|
@ -62,7 +71,7 @@ with lib;
|
|||
name = "v2ray.json";
|
||||
text = builtins.toJSON cfg.config;
|
||||
checkPhase = ''
|
||||
${pkgs.v2ray}/bin/v2ray -test -config $out
|
||||
${cfg.package}/bin/v2ray -test -config $out
|
||||
'';
|
||||
};
|
||||
|
||||
|
@ -78,10 +87,9 @@ with lib;
|
|||
description = "v2ray Daemon";
|
||||
after = [ "network.target" ];
|
||||
wantedBy = [ "multi-user.target" ];
|
||||
path = [ pkgs.v2ray ];
|
||||
script = ''
|
||||
exec v2ray -config ${configFile}
|
||||
'';
|
||||
serviceConfig = {
|
||||
ExecStart = "${cfg.package}/bin/v2ray -config ${configFile}";
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue