swiftPackages.swift{,-corelibs-libdispatch}: fix build with modern clang

We apply this patch to the copy of libdispatch that's copied into Swift and to the standalone build.
2025-10-11 14:44:17 -07:00
parent 60a9738efa
commit f3ea847829
2 changed files with 11 additions and 0 deletions
@@ -425,6 +425,13 @@ stdenv.mkDerivation {
           hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA=";
         }
       }
+       patch -p1 -d swift-corelibs-libdispatch -i ${
+         # Fix the build with modern Clang.
+         fetchpatch {
+           url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/38872e2d44d66d2fb94186988509defc734888a5.patch";
+           hash = "sha256-GABwDeTjciV36Sa0FS10mCfFCqRoBBstgW/OiKdPahA=";
+         }
+       }
     ''}
  '';

@@ -38,6 +38,10 @@ stdenv.mkDerivation {
      url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/30bb8019ba79cdae0eb1dc0c967c17996dd5cc0a.patch";
      hash = "sha256-wPZQ4wtEWk8HaKMfzjamlU6p/IW5EFiTssY63rGM+ZA=";
    })
+    (fetchpatch {
+      url = "https://github.com/swiftlang/swift-corelibs-libdispatch/commit/38872e2d44d66d2fb94186988509defc734888a5.patch";
+      hash = "sha256-GABwDeTjciV36Sa0FS10mCfFCqRoBBstgW/OiKdPahA=";
+    })

    ./disable-swift-overlay.patch
  ];