diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-08-31 10:04:20 +0200 |
| commit | ad1d58c6227abf2a9c80311eb09166a532384ed2 (patch) | |
| tree | 852498ff298f9b01c0d2c8b4c883da1a00912260 /nixos/modules/services/misc/nix-daemon.nix | |
| parent | ebe4fd146b29c92fb59f243f75e46afc9f1a9048 (diff) | |
| parent | fc74ba8291a8a93cba428de6bc2e7c8c7f9330f4 (diff) | |
| download | nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.gz nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.bz2 nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.lz nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.xz nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.tar.zst nixpkgs-ad1d58c6227abf2a9c80311eb09166a532384ed2.zip | |
Merge staging-next into staging
Diffstat (limited to 'nixos/modules/services/misc/nix-daemon.nix')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index aa781f93b66..3826f728afd 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -8,7 +8,9 @@ let nix = cfg.package.out; - isNix20 = versionAtLeast (getVersion nix) "2.0pre"; + nixVersion = getVersion nix; + + isNix20 = versionAtLeast nixVersion "2.0pre"; makeNixBuildUser = nr: { name = "nixbld${toString nr}"; @@ -61,6 +63,9 @@ let builders = ''} system-features = ${toString cfg.systemFeatures} + ${optionalString (versionAtLeast nixVersion "2.3pre") '' + sandbox-fallback = false + ''} $extraOptions END '' + optionalString cfg.checkConfig ( |