From 2c1e20b469357c113d51231101fc944a2e475434 Mon Sep 17 00:00:00 2001 From: Sarah Date: Fri, 29 Oct 2021 23:32:38 +0200 Subject: [PATCH] module: Fix pkgs.callPackage not neccessary. --- module.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module.nix b/module.nix index 8550ed1..0e6f0a1 100644 --- a/module.nix +++ b/module.nix @@ -2,7 +2,7 @@ let cfg = config.services.peerix; - peerix = pkgs.callPackage ./default.nix {}; + peerix = import ./default.nix; in { options = with lib; { @@ -121,14 +121,14 @@ in ]) (lib.mkIf (cfg.privateKeyFile != null) [ - (toString cfg.privateKeyFile) + cfg.privateKeyFile ]) ]; ExecPaths = [ "/nix/store" ]; Environment = lib.mkIf (cfg.privateKeyFile != null) [ - "NIX_SECRET_KEY_FILE=${toString cfg.privateKeyFile}" + "NIX_SECRET_KEY_FILE=${cfg.privateKeyFile}" ]; }; script = '' @@ -141,8 +141,8 @@ in "http://127.0.0.1:12304/" ]; binaryCachePublicKeys = [ - lib.mkIf (cfg.publicKeyFile != null) (builtins.readFile cfg.publicKeyFile) - lib.mkIf (cfg.publicKey != null) cfg.publicKey + (lib.mkIf (cfg.publicKeyFile != null) (builtins.readFile cfg.publicKeyFile)) + (lib.mkIf (cfg.publicKey != null) cfg.publicKey) ]; extraOptions = lib.mkIf (cfg.globalCacheTTL != null) ''