Merge pull request #288407 from trofi/setuptools-build-hook-not-always-parallel
This commit is contained in:
commit
aee01490db
|
@ -195,6 +195,8 @@ in {
|
||||||
propagatedBuildInputs = [ setuptools wheel ];
|
propagatedBuildInputs = [ setuptools wheel ];
|
||||||
substitutions = {
|
substitutions = {
|
||||||
inherit pythonInterpreter setuppy;
|
inherit pythonInterpreter setuppy;
|
||||||
|
# python2.pkgs.setuptools does not support parallelism
|
||||||
|
setuptools_has_parallel = setuptools != null && lib.versionAtLeast setuptools.version "69";
|
||||||
};
|
};
|
||||||
} ./setuptools-build-hook.sh) {};
|
} ./setuptools-build-hook.sh) {};
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@ echo "Sourcing setuptools-build-hook"
|
||||||
|
|
||||||
setuptoolsBuildPhase() {
|
setuptoolsBuildPhase() {
|
||||||
echo "Executing setuptoolsBuildPhase"
|
echo "Executing setuptoolsBuildPhase"
|
||||||
local args
|
local args setuptools_has_parallel=@setuptools_has_parallel@
|
||||||
runHook preBuild
|
runHook preBuild
|
||||||
|
|
||||||
cp -f @setuppy@ nix_run_setup
|
cp -f @setuppy@ nix_run_setup
|
||||||
|
@ -12,7 +12,9 @@ setuptoolsBuildPhase() {
|
||||||
args+="$setupPyGlobalFlags"
|
args+="$setupPyGlobalFlags"
|
||||||
fi
|
fi
|
||||||
if [ -n "$enableParallelBuilding" ]; then
|
if [ -n "$enableParallelBuilding" ]; then
|
||||||
setupPyBuildFlags+=" --parallel $NIX_BUILD_CORES"
|
if [ -n "$setuptools_has_parallel" ]; then
|
||||||
|
setupPyBuildFlags+=" --parallel $NIX_BUILD_CORES"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
if [ -n "$setupPyBuildFlags" ]; then
|
if [ -n "$setupPyBuildFlags" ]; then
|
||||||
args+=" build_ext $setupPyBuildFlags"
|
args+=" build_ext $setupPyBuildFlags"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user