From 9a61a0159433ac5352314547be036cb1e8e22b29 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 16 Apr 2025 18:39:40 +0300
Subject: [PATCH] qt6.qtwayland: backport fix recommended by upstream

---
 pkgs/development/libraries/qt-6/modules/qtwayland.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index 2dc646b19e28..791612abe8ab 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -7,10 +7,21 @@
   wayland-scanner,
   pkg-config,
   libdrm,
+  fetchpatch,
 }:
 
 qtModule {
   pname = "qtwayland";
+
+  # Backport fix for popups not rendering properly
+  # FIXME: remove in 6.9.1
+  patches = [
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/e4556c59f0c8250da7c16759432b2ac0a5ac9d9f.patch";
+      hash = "sha256-wRNXBwecuULn5MD87HP20uSuxHiuQslKp20DIuCGheM=";
+    })
+  ];
+
   # wayland-scanner needs to be propagated as both build
   # (for the wayland-scanner binary) and host (for the
   # actual wayland.xml protocol definition)