Merge master into staging-next

2024-06-09 12:01:06 +00:00
parent b45d7259e5 7cf6063c54
commit 668adff0d4
36 changed files with 661 additions and 142 deletions
@@ -307,10 +307,15 @@ in with passthru; stdenv.mkDerivation (finalAttrs: {
    # (since it will do a futile invocation of gcc (!) to find
    # libuuid, slowing down program startup a lot).
    noldconfigPatch
+  ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && stdenv.isFreeBSD) [
+    # Cross compilation only supports a limited number of "known good"
+    # configurations. If you're reading this and it's been a long time
+    # since this diff, consider submitting this patch upstream!
+    ./freebsd-cross.patch
+  ] ++ optionals (pythonOlder "3.13") [
    # Make sure that the virtualenv activation scripts are
    # owner-writable, so venvs can be recreated without permission
    # errors.
-  ] ++ optionals (pythonOlder "3.13") [
    ./virtualenv-permissions.patch
  ] ++ optionals (pythonAtLeast "3.13") [
    ./3.13/virtualenv-permissions.patch