Skip to content

Commit

Permalink
buildPython*: don't catch conflicts when cross-compiling
Browse files Browse the repository at this point in the history
Hack until we fix PYTHONPATH.
  • Loading branch information
FRidh committed Nov 19, 2020
1 parent 6501d98 commit 27d3a18
Showing 1 changed file with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,9 @@
, disabled ? false

# Raise an error if two packages are installed with the same name
, catchConflicts ? true
# 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)

# Additional arguments to pass to the makeWrapper function, which wraps
# generated binaries.
Expand Down

0 comments on commit 27d3a18

Please sign in to comment.