diff options
| author | regnat <rg@regnat.ovh> | 2021-05-24 10:51:02 +0200 |
|---|---|---|
| committer | regnat <rg@regnat.ovh> | 2021-05-24 10:51:02 +0200 |
| commit | 113823669b9b71fff84bc592d1fd6022635c28eb (patch) | |
| tree | 54aee12cc5bfce1b9ddd804702a1dbfb6272077b /nixos | |
| parent | bd249526ff5fdfa797673e8f42a99a97c9179c45 (diff) | |
Revert "nixos/nix-daemon: fix sandbox-paths option"
This reverts commit aeeee447bcc181d57a19d348f857326f4e1959fe.
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index df745fa7168bc..133e96da0ec8e 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -12,8 +12,6 @@ let isNix23 = versionAtLeast nixVersion "2.3pre"; - isNix24 = versionAtLeast nixVersion "2.4pre"; - makeNixBuildUser = nr: { name = "nixbld${toString nr}"; value = { @@ -43,11 +41,7 @@ let max-jobs = ${toString (cfg.maxJobs)} cores = ${toString (cfg.buildCores)} sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox} - ${if isNix24 then '' - sandbox-paths = ${toString cfg.sandboxPaths} - '' else '' - extra-sandbox-paths = ${toString cfg.sandboxPaths} - ''} + extra-sandbox-paths = ${toString cfg.sandboxPaths} substituters = ${toString cfg.binaryCaches} trusted-substituters = ${toString cfg.trustedBinaryCaches} trusted-public-keys = ${toString cfg.binaryCachePublicKeys} |