nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-21 08:01:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

swiftPackages.swift: clang 15 -> 16

Browse Source
This commit is contained in:
Sam
2025-09-18 11:40:55 -07:00
parent e5aaa8c8e9
commit 8aff8a38bc
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/swift/compiler/default.nix
View File

@@ -541,7 +541,7 @@ stdenv.mkDerivation {
# Ensure that the built Clang can find the runtime libraries by
# copying the symlinks from the main wrapper.
cp -P ${clang}/resource-root/{lib,share} $SWIFT_BUILD_ROOT/llvm/lib/clang/15.0.0/
cp -P ${clang}/resource-root/{lib,share} $SWIFT_BUILD_ROOT/llvm/lib/clang/16.0.0/
''
+ lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -712,7 +712,7 @@ stdenv.mkDerivation {
# Undo the clang and swift wrapping we did for the build.
# (This happened via patches to cmake files.)
cd $SWIFT_BUILD_ROOT
mv llvm/bin/clang-15{-unwrapped,}
mv llvm/bin/clang-16{-unwrapped,}
mv swift/bin/swift-frontend{-unwrapped,}
mkdir $lib
@@ -751,7 +751,7 @@ stdenv.mkDerivation {
# Swift has a separate resource root from Clang, but locates the Clang
# resource root via subdir or symlink.
mv $SWIFT_BUILD_ROOT/llvm/lib/clang/15.0.0 $lib/lib/swift/clang
mv $SWIFT_BUILD_ROOT/llvm/lib/clang/16.0.0 $lib/lib/swift/clang
'';
preFixup = lib.optionalString stdenv.hostPlatform.isLinux ''