colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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:
Martin Weinelt 2023-11-18 12:58:15 +01:00
parent f292ef4958
commit d9327a53de
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkgs/development/interpreters/python/python2/mk-python-derivation.nix
View File

@ -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.