From 8aaea3781cca59530315eafe70f3d65a03d72657 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 3 Nov 2024 01:00:39 +0000
Subject: [PATCH] =?UTF-8?q?libsForQt5.*:=20don=E2=80=99t=20propagate=20Dar?=
 =?UTF-8?q?win=20version=20inputs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../libraries/qt-5/modules/qtbase.nix         | 20 ++++++++-----------
 pkgs/development/libraries/qt-5/qtModule.nix  |  1 +
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix
index 748d4d1e0386..eb3fc8af96d7 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_13, xcbuild
+, apple-sdk_13, darwinMinVersionHook, xcbuild
 
 , dbus, fontconfig, freetype, glib, harfbuzz, icu, libdrm, libX11, libXcomposite
 , libXcursor, libXext, libXi, libXrender, libinput, libjpeg, libpng , libxcb
@@ -41,12 +41,11 @@ let
   # 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;
   deploymentTarget = "10.13";
-  propagatedMinVersionHook = darwinMinVersionHook deploymentTarget;
-  buildAppleSDK = apple-sdk_13;
+  darwinVersionInputs = [
+    apple-sdk_13
+    (darwinMinVersionHook deploymentTarget)
+  ];
 in
 
 stdenv.mkDerivation (finalAttrs: ({
@@ -63,11 +62,8 @@ stdenv.mkDerivation (finalAttrs: ({
     # Image formats
     libjpeg libpng
     pcre2
-  ] ++ (
-    if stdenv.hostPlatform.isDarwin then [
-      propagatedAppleSDK
-      propagatedMinVersionHook
-    ] else [
+  ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) (
+    [
       dbus glib udev
 
       # Text rendering
@@ -87,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: ({
       [ libinput ]
       ++ lib.optional withGtk3 gtk3
     )
-    ++ lib.optional stdenv.isDarwin buildAppleSDK
+    ++ lib.optional stdenv.isDarwin darwinVersionInputs
     ++ lib.optional developerBuild gdb
     ++ lib.optional (cups != null) cups
     ++ lib.optional (mysqlSupport) libmysqlclient
diff --git a/pkgs/development/libraries/qt-5/qtModule.nix b/pkgs/development/libraries/qt-5/qtModule.nix
index 10895ec07fd1..d3d810cbbf68 100644
--- a/pkgs/development/libraries/qt-5/qtModule.nix
+++ b/pkgs/development/libraries/qt-5/qtModule.nix
@@ -30,6 +30,7 @@ mkDerivation (args // {
     # Per https://doc.qt.io/qt-5/macos.html#supported-versions
     ++ lib.optionals stdenv.isDarwin [
       apple-sdk_13
+      (darwinMinVersionHook "10.13")
     ];
 
   nativeBuildInputs =