summary refs log tree commit diff
path: root/pkgs/development
diff options
context:
space:
mode:
authorNick Cao <nickcao@nichi.co>2023-11-20 20:24:32 -0500
committerGitHub <noreply@github.com>2023-11-20 20:24:32 -0500
commit97b703bcc8b0bf1d27d724cc0b29b09c96f06791 (patch)
tree8aa5f9c8cd343df9d640a50d241cf140e8c51517 /pkgs/development
parent6d50b4ba87d53263521395a01f893ab148545597 (diff)
parent80e1bce562cc45903ac7912c28bd8200167f77bb (diff)
Merge pull request #268720 from NickCao/qtwayland
qt6.qtwayland: fix a crash issue with popup/submenus
Diffstat (limited to 'pkgs/development')
-rw-r--r--pkgs/development/libraries/qt-6/modules/qtwayland.nix6
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index 94f3b80e9c379..e07790edad6e1 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -19,5 +19,11 @@ qtModule {
       url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=6fe83f6076423068b652fa4fcb0b5adbd297f2a8";
       hash = "sha256-TlZozKezpYm90B9qFP9qv76asRdIt+5bq9E3GcmFiDc=";
     })
+    # Fix potential crash issues when some submenus are expanded
+    # https://codereview.qt-project.org/c/qt/qtwayland/+/519344/
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/qt/qtwayland.git/patch/?id=aae65c885d8e38d8abc2959cded7b5e9e5fc88b3";
+      hash = "sha256-FD1VaiTgl9Z1y+5EDpWYShM1ULoFdET86FoFfqDmjyo=";
+    })
   ];
 }