diff options
author | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2019-12-30 16:27:24 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-30 16:27:24 +0100 |
commit | 9bc8e546c9ff38ece6f178a88055e19d16f872c9 (patch) | |
tree | 66d35f295c263bb11e915785debd2ed0e504521b /pkgs/os-specific/linux/kernel | |
parent | c94e211a478e6dc696ea66103edef32c67045ecc (diff) | |
parent | 480fc1856a41800cde7f0b154f9bb0c3f8c4e27a (diff) | |
download | nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.tar nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.tar.gz nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.tar.bz2 nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.tar.lz nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.tar.xz nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.tar.zst nixpkgs-9bc8e546c9ff38ece6f178a88055e19d16f872c9.zip |
Merge pull request #75929 from NixOS/staging-next
Staging next
Diffstat (limited to 'pkgs/os-specific/linux/kernel')
-rw-r--r-- | pkgs/os-specific/linux/kernel/manual-config.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix index d206910732c..0538511c528 100644 --- a/pkgs/os-specific/linux/kernel/manual-config.nix +++ b/pkgs/os-specific/linux/kernel/manual-config.nix @@ -164,6 +164,10 @@ let ] ++ (optional isModular "INSTALL_MOD_PATH=$(out)") ++ optional installsFirmware "INSTALL_FW_PATH=$(out)/lib/firmware"; + preInstall = '' + installFlagsArray+=("-j$NIX_BUILD_CORES") + ''; + # Some image types need special install targets (e.g. uImage is installed with make uinstall) installTargets = [ ( if platform ? kernelInstallTarget then platform.kernelInstallTarget |