summary refs log tree commit diff
path: root/nixos/modules/installer/tools/nixos-generate-config.pl
diff options
context:
space:
mode:
authorJörg Thalheim <joerg@thalheim.io>2020-04-07 08:21:02 +0100
committerJörg Thalheim <joerg@thalheim.io>2020-04-07 08:45:56 +0100
commite6a15db534d18d0eefb5916ee87b4951d51af2cf (patch)
tree69d2eb71b8dbb7fb0debecdefa253b1c3b844074 /nixos/modules/installer/tools/nixos-generate-config.pl
parent5d3f4e9c0b9c3ccfbd48e5b472ad064215fd4a28 (diff)
downloadnixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.tar
nixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.tar.gz
nixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.tar.bz2
nixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.tar.lz
nixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.tar.xz
nixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.tar.zst
nixpkgs-e6a15db534d18d0eefb5916ee87b4951d51af2cf.zip
nixos: default nix.maxJobs to auto
Instead of making the configuration less portable by hard coding the number of
jobs equal to the cores we can also let nix set the same number at runtime.
Diffstat (limited to 'nixos/modules/installer/tools/nixos-generate-config.pl')
-rw-r--r--nixos/modules/installer/tools/nixos-generate-config.pl4
1 files changed, 0 insertions, 4 deletions
diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl
index 629c56814a1..a32c19a4eba 100644
--- a/nixos/modules/installer/tools/nixos-generate-config.pl
+++ b/nixos/modules/installer/tools/nixos-generate-config.pl
@@ -91,9 +91,6 @@ sub hasCPUFeature {
 }
 
 
-# Detect the number of CPU cores.
-my $cpus = scalar (grep {/^processor\s*:/} (split '\n', $cpuinfo));
-
 
 # Determine CPU governor to use
 if (-e "/sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors") {
@@ -562,7 +559,6 @@ my $hwConfig = <<EOF;
   boot.kernelModules = [$kernelModules ];
   boot.extraModulePackages = [$modulePackages ];
 $fsAndSwap
-  nix.maxJobs = lib.mkDefault $cpus;
 ${\join "", (map { "  $_\n" } (uniq @attrs))}}
 EOF