From 2153141b5127a6f5fa4ad70b4e99976bc092dc39 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 2 Sep 2025 04:05:22 +0100
Subject: [PATCH] swiftPackages.*: build with the default LLVM version

---
 pkgs/development/compilers/swift/compiler/default.nix | 6 +++++-
 pkgs/development/compilers/swift/default.nix          | 3 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/swift/compiler/default.nix b/pkgs/development/compilers/swift/compiler/default.nix
index 27bcd8b7ac6b..5de54078f519 100644
--- a/pkgs/development/compilers/swift/compiler/default.nix
+++ b/pkgs/development/compilers/swift/compiler/default.nix
@@ -467,7 +467,11 @@ stdenv.mkDerivation {
   '';
 
   # > clang-15-unwrapped: error: unsupported option '-fzero-call-used-regs=used-gpr' for target 'arm64-apple-macosx10.9.0'
-  hardeningDisable = lib.optional stdenv.hostPlatform.isAarch64 "zerocallusedregs";
+  # > clang-15-unwrapped: error: argument unused during compilation: '-fstack-clash-protection' [-Werror,-Wunused-command-line-argument]
+  hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "zerocallusedregs"
+    "stackclashprotection"
+  ];
 
   configurePhase = ''
     export SWIFT_SOURCE_ROOT="$PWD"
diff --git a/pkgs/development/compilers/swift/default.nix b/pkgs/development/compilers/swift/default.nix
index 0215cd6f0ba3..972efa2d4a6c 100644
--- a/pkgs/development/compilers/swift/default.nix
+++ b/pkgs/development/compilers/swift/default.nix
@@ -4,13 +4,12 @@
   newScope,
   darwin,
   llvmPackages,
-  llvmPackages_15,
   overrideCC,
   overrideLibcxx,
 }:
 
 let
-  swiftLlvmPackages = llvmPackages_15;
+  swiftLlvmPackages = llvmPackages;
 
   self = rec {