diff --git a/etc/default.nix b/etc/default.nix index 1e7f3dc7dd9a..414b4ccde722 100644 --- a/etc/default.nix +++ b/etc/default.nix @@ -116,6 +116,17 @@ import ../helpers/make-etc.nix { target = "inputrc"; } + { # Nix configuration. + source = pkgs.writeText "nix.conf" " + # WARNING: this file is generated. + build-users-group = nixbld + build-max-jobs = ${toString (config.get ["nix" "maxJobs"])} + build-use-chroot = ${if config.get ["nix" "useChroot"] then "true" else "false"} + build-chroot-dirs = /dev /proc /bin /etc + ${config.get ["nix" "extraOptions"]} + "; + target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh. + } ] # Configuration file for fontconfig used to locate diff --git a/system/activate-configuration.sh b/system/activate-configuration.sh index 7aba11b26423..fecfa7cb5a3d 100644 --- a/system/activate-configuration.sh +++ b/system/activate-configuration.sh @@ -101,17 +101,8 @@ fi # Set up Nix. if test -z "@readOnlyRoot@"; then - mkdir -p /nix/etc/nix - cat > /nix/etc/nix/nix.conf <