Merge staging-next into staging

2023-02-05 00:03:15 +00:00
parent 22080492aa bc833a50cc
commit dfee1a3150
81 changed files with 690 additions and 323 deletions
@@ -345,6 +345,8 @@ in with passthru; stdenv.mkDerivation {
    "ac_cv_computed_gotos=yes"
    "ac_cv_file__dev_ptmx=yes"
    "ac_cv_file__dev_ptc=yes"
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
+    "--with-build-python=${pythonForBuildInterpreter}"
  ] ++ optionals stdenv.hostPlatform.isLinux [
    # Never even try to use lchmod on linux,
    # don't rely on detecting glibc-isms.