pyrox.dev
Merge pull request #124237 from regnat/revert-sandbox-path-option
Revert "nixos/nix-daemon: fix sandbox-paths option"
authored by
Gabriel Ebner
and committed by
GitHub
b6ce87ae
6e72346f
+1
-7
nixos/modules/services/misc/nix-daemon.nix
+1
-7
nixos/modules/services/misc/nix-daemon.nix
···
12
12
13
13
isNix23 = versionAtLeast nixVersion "2.3pre";
14
14
15
-
isNix24 = versionAtLeast nixVersion "2.4pre";
16
-
17
15
makeNixBuildUser = nr: {
18
16
name = "nixbld${toString nr}";
19
17
value = {
···
43
41
max-jobs = ${toString (cfg.maxJobs)}
44
42
cores = ${toString (cfg.buildCores)}
45
43
sandbox = ${if (builtins.isBool cfg.useSandbox) then boolToString cfg.useSandbox else cfg.useSandbox}
46
-
${if isNix24 then ''
47
-
sandbox-paths = ${toString cfg.sandboxPaths}
48
-
'' else ''
49
-
extra-sandbox-paths = ${toString cfg.sandboxPaths}
50
-
''}
44
+
extra-sandbox-paths = ${toString cfg.sandboxPaths}
51
45
substituters = ${toString cfg.binaryCaches}
52
46
trusted-substituters = ${toString cfg.trustedBinaryCaches}
53
47
trusted-public-keys = ${toString cfg.binaryCachePublicKeys}