swift: fix build with LLVM 15

See here for context: #213202 (comment)
NixOS · Apr 16, 2023 · fc726d5 · fc726d5
1 parent 0ecb762
commit fc726d5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 1 deletion.
diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
@@ -307,6 +307,17 @@ in stdenv.mkDerivation {
       sha256 = "1rma1al0rbm3s3ql6bnvbcighp74lri1lcrwbyacgdqp80fgw1b6";
     }}
 
+    ${lib.optionalString (!stdenv.isDarwin) ''
+    # Needed to build with clang 15+ without disabling warnings; can drop this
+    # once we update to 5.8.x.
+    patch -p1 -d swift-corelibs-libdispatch -i ${fetchpatch {
+      name = "swift-corelibs-libdispatch-fix-unused-but-set-warning";
+      url = "https://github.com/apple/swift-corelibs-libdispatch/commit/915f25141a7c57b6a2a3bc8697572644af181ec5.patch";
+      sha256 = "sha256-gxhMwSlE/y4LkOvmCaDMPjd7EcoX6xaacK4MLa3mOUM=";
+      includes = ["src/shims/yield.c"];
+    }}
+    ''}
+
     ${lib.optionalString stdenv.isLinux ''
     substituteInPlace llvm-project/clang/lib/Driver/ToolChains/Linux.cpp \
       --replace 'SysRoot + "/lib' '"${glibc}/lib" "' \

diff --git a/pkgs/development/compilers/swift/libdispatch/default.nix b/pkgs/development/compilers/swift/libdispatch/default.nix
@@ -1,6 +1,7 @@
 { lib
 , stdenv
 , callPackage
+, fetchpatch
 , cmake
 , ninja
 , useSwift ? true, swift
@@ -19,7 +20,18 @@ in stdenv.mkDerivation {
   nativeBuildInputs = [ cmake ]
     ++ lib.optionals useSwift [ ninja swift ];
 
-  patches = [ ./disable-swift-overlay.patch ];
+  patches = [
+    ./disable-swift-overlay.patch
+
+    # Needed to build with clang 15+ without disabling warnings; can drop this
+    # once we update to 5.8.x.
+    (fetchpatch {
+      name = "swift-corelibs-libdispatch-fix-unused-but-set-warning";
+      url = "https://github.com/apple/swift-corelibs-libdispatch/commit/915f25141a7c57b6a2a3bc8697572644af181ec5.patch";
+      sha256 = "sha256-gxhMwSlE/y4LkOvmCaDMPjd7EcoX6xaacK4MLa3mOUM=";
+      includes = ["src/shims/yield.c"];
+    })
+  ];
 
   cmakeFlags = lib.optional useSwift "-DENABLE_SWIFT=ON";