rhi/peerix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

module: Fix pkgs.callPackage not neccessary.

Browse source
This commit is contained in:
Sarah 2021-10-29 23:32:38 +02:00
parent 2886c88379
commit 2c1e20b469
No known key found for this signature in database
GPG key ID: 708F7ACE058F0186
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
module.nix
View file

@ -2,7 +2,7 @@
let let
cfg = config.services.peerix; cfg = config.services.peerix;
peerix = pkgs.callPackage ./default.nix {}; peerix = import ./default.nix;
in in
{ {
options = with lib; { options = with lib; {
@ -121,14 +121,14 @@ in
]) ])
(lib.mkIf (cfg.privateKeyFile != null) [ (lib.mkIf (cfg.privateKeyFile != null) [
(toString cfg.privateKeyFile) cfg.privateKeyFile
]) ])
]; ];
ExecPaths = [ ExecPaths = [
"/nix/store" "/nix/store"
]; ];
Environment = lib.mkIf (cfg.privateKeyFile != null) [ Environment = lib.mkIf (cfg.privateKeyFile != null) [
"NIX_SECRET_KEY_FILE=${toString cfg.privateKeyFile}" "NIX_SECRET_KEY_FILE=${cfg.privateKeyFile}"
]; ];
}; };
script = '' script = ''
@ -141,8 +141,8 @@ in
"http://127.0.0.1:12304/" "http://127.0.0.1:12304/"
]; ];
binaryCachePublicKeys = [ binaryCachePublicKeys = [
lib.mkIf (cfg.publicKeyFile != null) (builtins.readFile cfg.publicKeyFile) (lib.mkIf (cfg.publicKeyFile != null) (builtins.readFile cfg.publicKeyFile))
lib.mkIf (cfg.publicKey != null) cfg.publicKey (lib.mkIf (cfg.publicKey != null) cfg.publicKey)
]; ];
extraOptions = lib.mkIf (cfg.globalCacheTTL != null) '' extraOptions = lib.mkIf (cfg.globalCacheTTL != null) ''