Revert "Revert "buildPython*: wrap setuptools in hook for catching conflicts""

Most packages were fixed up on python-unstable branch. This reverts commit 3ff2d9362c.
2022-09-20 09:49:27 +02:00
parent f1dcc2356b
commit 8895944c57
3 changed files with 3 additions and 4 deletions
@@ -2,7 +2,7 @@
 echo "Sourcing python-catch-conflicts-hook.sh"

 pythonCatchConflictsPhase() {
-    @pythonInterpreter@ @catchConflicts@
+    PYTHONPATH="@setuptools@/@pythonSitePackages@:$PYTHONPATH" @pythonInterpreter@ @catchConflicts@
 }

 if [ -z "${dontUsePythonCatchConflicts-}" ]; then