From 6b77ed4b187da1d42ec4ee727bcdd9d62baa6db3 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 10 Apr 2025 16:29:06 +0300 Subject: [PATCH] qt5: switch to Apple SDK 14 on -darwin platforms Fixes weird linking errors seen with SDK 13. --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 +++----- pkgs/development/libraries/qt-5/qtModule.nix | 4 ++-- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 6e695551b528..0e55f0944cee 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -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 diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix index 7925983f0446..b7a83d12c099 100644 --- a/pkgs/development/libraries/qt-5/qtModule.nix +++ b/pkgs/development/libraries/qt-5/qtModule.nix @@ -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 =