Merge master into staging-next

2025-03-21 18:04:59 +00:00
parent d723427220 b9a69c9b57
commit f02955ed47
87 changed files with 643 additions and 3183 deletions
@@ -434,6 +434,9 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
    for path in /usr /sw /opt /pkg; do
      substituteInPlace ./setup.py --replace-warn $path /no-such-path
    done
+  '' + optionalString (stdenv.hostPlatform.isDarwin && pythonOlder "3.12") ''
+    # Fix _ctypes module compilation
+    export NIX_CFLAGS_COMPILE+=" -DUSING_APPLE_OS_LIBFFI=1"
  '' + optionalString stdenv.hostPlatform.isDarwin ''
    # Override the auto-detection in setup.py, which assumes a universal build
    export PYTHON_DECIMAL_WITH_MACHINE=${if stdenv.hostPlatform.isAarch64 then "uint128" else "x64"}