summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorDaiderd Jordan <daiderd@gmail.com>2019-02-22 00:02:10 +0100
committerDaiderd Jordan <daiderd@gmail.com>2019-02-22 00:02:10 +0100
commit1a3a9d91b461f7e8bda13d0e50ead976cc8a0d1a (patch)
tree99342118809321ff4e0e2ce92973e2ee6cff7420 /modules
parent132a7f0a09d222df25604836893e3420b1c165cf (diff)
nix-daemon: make default values overridable without mkForce
Diffstat (limited to 'modules')
-rw-r--r--modules/services/nix-daemon.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/services/nix-daemon.nix b/modules/services/nix-daemon.nix
index f3f2c2d..061a308 100644
--- a/modules/services/nix-daemon.nix
+++ b/modules/services/nix-daemon.nix
@@ -45,10 +45,10 @@ in
launchd.daemons.nix-daemon = {
command = "${config.nix.package}/bin/nix-daemon";
- serviceConfig.ProcessType = "Interactive";
+ serviceConfig.ProcessType = mkDefault "Interactive";
serviceConfig.LowPriorityIO = config.nix.daemonIONice;
serviceConfig.Nice = config.nix.daemonNiceLevel;
- serviceConfig.SoftResourceLimits.NumberOfFiles = 4096;
+ serviceConfig.SoftResourceLimits.NumberOfFiles = mkDefault 4096;
serviceConfig.StandardErrorPath = cfg.logFile;
serviceConfig.KeepAlive = mkIf (!cfg.enableSocketListener) true;
@@ -63,7 +63,7 @@ in
{ NIX_SSL_CERT_FILE = mkDefault config.environment.variables.NIX_SSL_CERT_FILE;
TMPDIR = mkIf (cfg.tempDir != null) cfg.tempDir;
# FIXME: workaround for https://github.com/NixOS/nix/issues/2523
- OBJC_DISABLE_INITIALIZE_FORK_SAFETY = "YES";
+ OBJC_DISABLE_INITIALIZE_FORK_SAFETY = mkDefault "YES";
}
];
};