From d9327a53de76fe34739ce9eda3cc01240fe7321a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 18 Nov 2023 12:58:15 +0100
Subject: [PATCH] Revert "python2/mk-python-derivation: disable
 catchConflictsHook"

This reverts commit 397a8fd06bd576cae7f1fae71dbfd9fbce30dc66.

The hook now uses the old implementation based on the deprecated
pkg_resources library provided by setuptools again.
---
 .../interpreters/python/python2/mk-python-derivation.nix       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index 6d51b51b215d..1a6f9c784cf6 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -57,8 +57,7 @@
 # Raise an error if two packages are installed with the same name
 # TODO: For cross we probably need a different PYTHONPATH, or not
 # add the runtime deps until after buildPhase.
-# FIXME: disabled for Python 2 because broken
-, catchConflicts ? false
+, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
 
 # Additional arguments to pass to the makeWrapper function, which wraps
 # generated binaries.