summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-11-27 16:22:18 -0500
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2023-11-28 13:26:32 +0000
commitf05eb35cd5359d0fb4553a4921dfda23bd50722d (patch)
tree5808ff3f07030f51357505a466971eb11eb1b0d9
parentqt6.qtwayland: drop outdated patches (diff)
downloadnixpkgs-origin/backport-270439-to-release-23.11.tar.gz
qt6.qtbase: fix build on older macOSorigin/backport-270439-to-release-23.11
(cherry picked from commit 64c132c42759d4bf3722e8e24905f86f02180567)
-rw-r--r--pkgs/development/libraries/qt-6/default.nix7
1 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index 61642b482af3..220e60f5c371 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -55,6 +55,13 @@ let
./patches/0009-qtbase-find-qmlimportscanner-in-macdeployqt-via-envi.patch
./patches/0010-qtbase-check-in-the-QML-folder-of-this-library-does-.patch
./patches/0011-qtbase-derive-plugin-load-path-from-PATH.patch
+ # Revert "macOS: Silence warning about supporting secure state restoration"
+ # fix build with macOS sdk < 12.0
+ (fetchpatch2 {
+ url = "https://github.com/qt/qtbase/commit/fc1549c01445bb9c99d3ba6de8fa9da230614e72.patch";
+ revert = true;
+ hash = "sha256-cjB2sC4cvZn0UEc+sm6ZpjyC78ssqB1Kb5nlZQ15M4A=";
+ })
];
};
env = callPackage ./qt-env.nix { };