Merge pull request #26805 from obsidiansystems/cross-elegant

Make cross compilation elegant
2017-12-30 22:58:02 -05:00
parent 553fd19e67 a98e68676d
commit 4d2b763817
88 changed files with 1059 additions and 699 deletions
--- a/pkgs/development/interpreters/python/setup-hook.sh
+++ b/pkgs/development/interpreters/python/setup-hook.sh
@@ -12,7 +12,7 @@ toPythonPath() {
    echo $result
 }

-envHooks+=(addPythonPath)
+addEnvHooks "$hostOffset" addPythonPath

 # Determinism: The interpreter is patched to write null timestamps when compiling python files.
 # This way python doesn't try to update them when we freeze timestamps in nix store.