1
0
Fork 0
mirror of https://github.com/LnL7/nix-darwin.git synced 2025-03-31 04:04:45 +00:00

nix-daemon: don't set tempDir by default

This commit is contained in:
Daiderd Jordan 2017-10-08 13:15:13 +02:00
parent 3efff52877
commit f0ee1438ec
No known key found for this signature in database
GPG key ID: D02435D05B810C96

View file

@ -3,27 +3,21 @@
with lib; with lib;
let let
cfg = config.services.nix-daemon; cfg = config.services.nix-daemon;
in in
{ {
options = { options = {
services.nix-daemon = { services.nix-daemon.enable = mkOption {
type = types.bool;
enable = mkOption { default = false;
type = types.bool; description = "Whether to activate system at boot time.";
default = false; };
description = "Whether to activate system at boot time.";
};
tempDir = mkOption {
type = types.path;
default = "/tmp";
description = "The TMPDIR to use for nix-daemon.";
};
services.nix-daemon.tempDir = mkOption {
type = types.nullOr types.path;
default = null;
description = "The TMPDIR to use for nix-daemon.";
}; };
}; };
@ -46,9 +40,8 @@ in
serviceConfig.SoftResourceLimits.NumberOfFiles = 4096; serviceConfig.SoftResourceLimits.NumberOfFiles = 4096;
serviceConfig.EnvironmentVariables = config.nix.envVars serviceConfig.EnvironmentVariables = config.nix.envVars
# // { CURL_CA_BUNDLE = "/etc/ssl/certs/ca-certificates.crt"; } // { NIX_SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; }
// { SSL_CERT_FILE = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; } // optionalAttrs (cfg.tempDir != null) { TMPDIR = cfg.tempDir; };
// { TMPDIR = "${cfg.tempDir}"; };
}; };
}; };