Revert "python2/mk-python-derivation: disable catchConflictsHook"
This reverts commit 397a8fd06b
.
The hook now uses the old implementation based on the deprecated
pkg_resources library provided by setuptools again.
This commit is contained in:
parent
f292ef4958
commit
d9327a53de
@ -57,8 +57,7 @@
|
|||||||
# Raise an error if two packages are installed with the same name
|
# Raise an error if two packages are installed with the same name
|
||||||
# TODO: For cross we probably need a different PYTHONPATH, or not
|
# TODO: For cross we probably need a different PYTHONPATH, or not
|
||||||
# add the runtime deps until after buildPhase.
|
# add the runtime deps until after buildPhase.
|
||||||
# FIXME: disabled for Python 2 because broken
|
, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
|
||||||
, catchConflicts ? false
|
|
||||||
|
|
||||||
# Additional arguments to pass to the makeWrapper function, which wraps
|
# Additional arguments to pass to the makeWrapper function, which wraps
|
||||||
# generated binaries.
|
# generated binaries.
|
||||||
|
Loading…
Reference in New Issue
Block a user