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

Merge pull request #268027 from K900/py2-hack

Browse Source
This commit is contained in:
Ryan Lahfa 2023-11-17 17:18:55 +01:00 committed by GitHub
commit 80063d0194
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 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,7 +57,8 @@
# 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.
, catchConflicts ? (python.stdenv.hostPlatform == python.stdenv.buildPlatform)
# FIXME: disabled for Python 2 because broken
, catchConflicts ? false
# Additional arguments to pass to the makeWrapper function, which wraps
# generated binaries.