From 3be309eff11e2eb677199997cb653b1358ccd5fd Mon Sep 17 00:00:00 2001 From: Emily Date: Mon, 28 Oct 2024 18:59:35 +0000 Subject: [PATCH] libsForQt5.qtbase: use the macOS 13 SDK --- pkgs/development/libraries/qt-5/modules/qtbase.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index 7f9b1461e3c5..0d2827a219ef 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -4,7 +4,7 @@ , coreutils, bison, flex, gdb, gperf, lndir, perl, pkg-config, python3 , which # darwin support -, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_14, xcbuild +, darwinMinVersionHook, apple-sdk, apple-sdk_10_14, apple-sdk_13, xcbuild , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb @@ -38,12 +38,14 @@ let then "linux-generic-g++" else throw "Please add a qtPlatformCross entry for ${plat.config}"; - # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, build SDK = 14.x. + # Per https://doc.qt.io/qt-5/macos.html#supported-versions: deployment target = 10.13, 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. # Note that Qt propagates the 10.14 SDK instead of the 10.13 SDK to make sure that applications linked to Qt # support automatic dark mode on x86_64-darwin (see: https://developer.apple.com/documentation/appkit/nsappearancecustomization/choosing_a_specific_appearance_for_your_macos_app). propagatedAppleSDK = if lib.versionOlder (lib.getVersion apple-sdk) "10.14" then apple-sdk_10_14 else apple-sdk; propagatedMinVersionHook = darwinMinVersionHook "10.13"; - buildAppleSDK = apple-sdk_14; + buildAppleSDK = apple-sdk_13; in stdenv.mkDerivation (finalAttrs: ({