Unverified Commit 80063d01 authored by Ryan Lahfa's avatar Ryan Lahfa Committed by GitHub
Browse files

Merge pull request #268027 from K900/py2-hack

parents f5a8f48a 397a8fd0
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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.