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

Merge pull request #124258 from domenkozar/revert-sandbox-path-21.05 

Revert "nixos/nix-daemon: fix sandbox-paths option"
This commit is contained in:
Domen Kožar 2021-05-24 15:37:55 +02:00 committed by GitHub
parent 97b94af4eb 0cebbdf687
commit 0ae5309111
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,8 +12,6 @@ let
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}";
value = { value = {
@ -43,11 +41,7 @@ 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}
${if isNix24 then '' extra-sandbox-paths = ${toString cfg.sandboxPaths}
sandbox-paths = ${toString cfg.sandboxPaths}
'' else ''
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}