Merge pull request #75929 from NixOS/staging-next

Staging next
2019-12-30 16:27:24 +01:00
parent c94e211a47 480fc1856a
commit 9bc8e546c9
40 changed files with 326 additions and 140 deletions
@@ -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