Merge pull request #267961 from wegank/mold-clang-16-2

dolphin-emu, ladybird, mold: switch to llvm 16 on darwin
This commit is contained in:
Weijia Wang
2023-11-17 00:37:14 +01:00
committed by GitHub
+3 -3
View File
@@ -2865,7 +2865,7 @@ with pkgs;
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
inherit (darwin) moltenvk;
stdenv =
if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv
if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv
else stdenv;
};
@@ -19651,7 +19651,7 @@ with pkgs;
modd = callPackage ../development/tools/modd { };
mold = callPackage ../development/tools/mold {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_13.stdenv else stdenv;
stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv;
tbb = tbb_2021_8;
};
@@ -33339,7 +33339,7 @@ with pkgs;
ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
ladybird = qt6Packages.callPackage ../applications/networking/browsers/ladybird {
stdenv = if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv;
stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_16.stdenv else stdenv;
};
lazpaint = callPackage ../applications/graphics/lazpaint { };