From 27d3a18ac7d34b66a14b634cb785e8c8caef024b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Thu, 19 Nov 2020 20:57:22 +0100 Subject: [PATCH] buildPython*: don't catch conflicts when cross-compiling Hack until we fix PYTHONPATH. --- pkgs/development/interpreters/python/mk-python-derivation.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix index c85a5939055..670c870f107 100644 --- a/pkgs/development/interpreters/python/mk-python-derivation.nix +++ b/pkgs/development/interpreters/python/mk-python-derivation.nix @@ -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.