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

Revert for now and fix on python-unstable branch. This reverts commit 13bb0f49f7.
2022-09-19 10:01:25 +02:00
parent 0a4898c21a
commit 3ff2d9362c
3 changed files with 4 additions and 3 deletions
@@ -92,8 +92,9 @@ in rec {
  pythonCatchConflictsHook = callPackage ({ setuptools }:
    makeSetupHook {
      name = "python-catch-conflicts-hook";
+      deps = [ setuptools ];
      substitutions = {
-        inherit pythonInterpreter pythonSitePackages setuptools;
+        inherit pythonInterpreter;
        catchConflicts=../catch_conflicts/catch_conflicts.py;
      };
    } ./python-catch-conflicts-hook.sh) {};
@@ -2,7 +2,7 @@
 echo "Sourcing python-catch-conflicts-hook.sh"

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

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