Commit d9327a53 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

Revert "python2/mk-python-derivation: disable catchConflictsHook" 

This reverts commit 397a8fd0.

The hook now uses the old implementation based on the deprecated
pkg_resources library provided by setuptools again.
parent f292ef49

pkgs/development/interpreters/python/python2/mk-python-derivation.nix

+1 −2
Original line number Diff line number Diff line
@@ -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.