mirrors/nix-darwin
mirrors/nix-darwin
1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-16 05:18:17 +00:00
Code Activity

nix-daemon: make cacert overridable without mkForce

Browse source 
Fixes #74
This commit is contained in:
Daiderd Jordan 2018-03-26 21:50:50 +02:00
parent cde11cf2b8
commit a9e0f71c50
No known key found for this signature in database
GPG key ID: D02435D05B810C96
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
modules/services/nix-daemon.nix
View file

@ -46,9 +46,13 @@ in
serviceConfig.SoftResourceLimits.NumberOfFiles = 4096; serviceConfig.SoftResourceLimits.NumberOfFiles = 4096;
serviceConfig.StandardErrorPath = cfg.logFile; serviceConfig.StandardErrorPath = cfg.logFile;
serviceConfig.EnvironmentVariables = config.nix.envVars serviceConfig.EnvironmentVariables = mkMerge [
// { NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; } config.nix.envVars
// optionalAttrs (cfg.tempDir != null) { TMPDIR = cfg.tempDir; }; {
NIX_SSL_CERT_FILE = mkDefault "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt";
TMPDIR = mkIf (cfg.tempDir != null) cfg.tempDir;
}
];
}; };
}; };