public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14887 from sheenobu/bugfix/14886/vbox_cpucore

Browse Source 
virtualbox: obey NIX_BUILD_CORES for make invocation
This commit is contained in:
Joachim Fasting 2016-04-23 19:42:31 +02:00
commit c4626ad354
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/applications/virtualization/virtualbox/default.nix
View File

@ -33,7 +33,7 @@ let
"$mod/Module.symvers" "$mod/Module.symvers"
fi fi
INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \
make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ make -j $NIX_BUILD_CORES -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \
"M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action}
done done
''; '';
@ -144,7 +144,7 @@ in stdenv.mkDerivation {
buildPhase = '' buildPhase = ''
source env.sh source env.sh
kmk BUILD_TYPE="${buildType}" kmk -j $NIX_BUILD_CORES BUILD_TYPE="${buildType}"
${forEachModule "modules"} ${forEachModule "modules"}
''; '';