diff options
| author | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-18 12:58:15 +0100 |
|---|---|---|
| committer | Martin Weinelt <hexa@darmstadt.ccc.de> | 2023-11-18 12:58:15 +0100 |
| commit | d9327a53de76fe34739ce9eda3cc01240fe7321a (patch) | |
| tree | cba1526e181d544582f9096ca7b9c38e61b04ee7 /pkgs/development/interpreters/python | |
| parent | f292ef4958bf9e1de18c62a315ed09f95954473a (diff) | |
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.
Diffstat (limited to 'pkgs/development/interpreters/python')
| -rw-r--r-- | pkgs/development/interpreters/python/python2/mk-python-derivation.nix | 3 |
1 files changed, 1 insertions, 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 6d51b51b215d4..1a6f9c784cf67 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. |