nixos/nix-daemon: fix unknown sandbox warnings

This commit is contained in:
Jörg Thalheim
2020-12-30 07:50:32 +01:00
parent 2070c6a11b
commit 64a7e509d7
+6 -1
View File
@@ -11,6 +11,7 @@ let
nixVersion = getVersion nix;
isNix23 = versionAtLeast nixVersion "2.3pre";
isNix24 = versionAtLeast nixVersion "2.4pre";
makeNixBuildUser = nr: {
name = "nixbld${toString nr}";
@@ -40,7 +41,11 @@ let
max-jobs = ${toString (cfg.maxJobs)}
cores = ${toString (cfg.buildCores)}
sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
extra-sandbox-paths = ${toString cfg.sandboxPaths}
${optionalString (!isNix24) ''
extra-sandbox-paths = ${toString cfg.sandboxPaths}
''}
substituters = ${toString cfg.binaryCaches}
trusted-substituters = ${toString cfg.trustedBinaryCaches}
trusted-public-keys = ${toString cfg.binaryCachePublicKeys}