qt5: switch to Apple SDK 14 on -darwin platforms

Fixes weird linking errors seen with SDK 13.
This commit is contained in:
K900
2025-04-10 16:30:53 +03:00
parent 1d039734de
commit 6b77ed4b18
2 changed files with 5 additions and 7 deletions
@@ -17,7 +17,7 @@
python3,
which,
# darwin support
apple-sdk_13,
apple-sdk_14,
xcbuild,
dbus,
@@ -88,11 +88,9 @@ let
throw "Please add a qtPlatformCross entry for ${plat.config}";
# Per https://doc.qt.io/qt-5/macos.html#supported-versions: build SDK = 13.x or 14.x.
# Despite advertising support for the macOS 14 SDK, the build system sets the maximum to 13 and complains
# about 14, so we just use that.
deploymentTarget = "10.13";
# SDK 13.x causes weird linking errors on x86_64-darwin, so use 14.x
darwinVersionInputs = [
apple-sdk_13
apple-sdk_14
];
in
+2 -2
View File
@@ -3,7 +3,7 @@
stdenv,
buildPackages,
mkDerivation,
apple-sdk_13,
apple-sdk_14,
perl,
qmake,
patches,
@@ -33,7 +33,7 @@ mkDerivation (
args.buildInputs or [ ]
# Per https://doc.qt.io/qt-5/macos.html#supported-versions
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_13
apple-sdk_14
];
nativeBuildInputs =