Merge staging-next into staging

2021-01-08 12:29:39 +00:00
parent 18280919d6 ecebf82121
commit 7aced83bf9
26 changed files with 509 additions and 24 deletions
@@ -370,7 +370,7 @@ in with passthru; stdenv.mkDerivation {

  # Add CPython specific setup-hook that configures distutils.sysconfig to
  # always load sysconfigdata from host Python.
-  postFixup = ''
+  postFixup = stdenv.lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
    cat << "EOF" >> "$out/nix-support/setup-hook"
    ${sysconfigdataHook}
    EOF