From a649d4f03832964080ca853695cd74d5fbaafa14 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 Apr 2022 07:18:34 +0100 Subject: [PATCH] python: use whitespace to split possible existing options Noticed option globbing when tried to enable parallelism by default locally for most packages by default. python3Packages.yt-dlp failed as: python3.9-yt-dlp> /nix/store/5mywvxdjkk1q6srwwwgdkzc37ibla801-python3.9-setuptools-61.2.0/lib/python3.9/site-packages/setuptools/dist.py:516: UserWarning: Normalizing '2022.04.08' to '2022.4.8' python3.9-yt-dlp> warnings.warn(tmpl.format(**locals())) python3.9-yt-dlp> invalid command name 'build_lazy_extractors--parallel' The change adds leading whitespace everywhere where options might already be present. --- .../interpreters/python/hooks/setuptools-build-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh index 89a95e982197..958a9378ef14 100644 --- a/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh +++ b/pkgs/development/interpreters/python/hooks/setuptools-build-hook.sh @@ -12,10 +12,10 @@ setuptoolsBuildPhase() { args+="$setupPyGlobalFlags" fi if [ -n "$enableParallelBuilding" ]; then - setupPyBuildFlags+="--parallel $NIX_BUILD_CORES" + setupPyBuildFlags+=" --parallel $NIX_BUILD_CORES" fi if [ -n "$setupPyBuildFlags" ]; then - args+="build_ext $setupPyBuildFlags" + args+=" build_ext $setupPyBuildFlags" fi eval "@pythonInterpreter@ nix_run_setup $args bdist_wheel"