public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nixos/nix-daemon: fix unknown sandbox warnings

Browse Source
This commit is contained in:
Jörg Thalheim 2020-11-19 11:47:29 +01:00
parent 2070c6a11b
commit 64a7e509d7
No known key found for this signature in database
GPG Key ID: 003F2096411B5F92
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nixos/modules/services/misc/nix-daemon.nix
View File

@ -11,6 +11,7 @@ let
nixVersion = getVersion nix; nixVersion = getVersion nix;
isNix23 = versionAtLeast nixVersion "2.3pre"; isNix23 = versionAtLeast nixVersion "2.3pre";
isNix24 = versionAtLeast nixVersion "2.4pre";
makeNixBuildUser = nr: { makeNixBuildUser = nr: {
name = "nixbld${toString nr}"; name = "nixbld${toString nr}";
@ -40,7 +41,11 @@ let
max-jobs = ${toString (cfg.maxJobs)} max-jobs = ${toString (cfg.maxJobs)}
cores = ${toString (cfg.buildCores)} cores = ${toString (cfg.buildCores)}
sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox} sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
${optionalString (!isNix24) ''
extra-sandbox-paths = ${toString cfg.sandboxPaths} extra-sandbox-paths = ${toString cfg.sandboxPaths}
''}
substituters = ${toString cfg.binaryCaches} substituters = ${toString cfg.binaryCaches}
trusted-substituters = ${toString cfg.trustedBinaryCaches} trusted-substituters = ${toString cfg.trustedBinaryCaches}
trusted-public-keys = ${toString cfg.binaryCachePublicKeys} trusted-public-keys = ${toString cfg.binaryCachePublicKeys}