diff options
Diffstat (limited to 'pkgs/development/libraries/qt-6/modules/qtwayland.nix')
| -rw-r--r-- | pkgs/development/libraries/qt-6/modules/qtwayland.nix | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix index 3fb5dae671e8..791612abe8ab 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix @@ -7,11 +7,21 @@ wayland-scanner, pkg-config, libdrm, - fetchpatch2, + 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) @@ -28,15 +38,6 @@ qtModule { buildInputs = [ libdrm ]; nativeBuildInputs = [ pkg-config ]; - patches = [ - # run waylandscanner with private-code to avoid conflict with symbols from libwayland - # better solution for https://github.com/NixOS/nixpkgs/pull/337913 - (fetchpatch2 { - url = "https://invent.kde.org/qt/qt/qtwayland/-/commit/67f121cc4c3865aa3a93cf563caa1d9da3c92695.patch"; - hash = "sha256-uh5lecHlHCWyO1/EU5kQ00VS7eti3PEvPA2HBCL9K0k="; - }) - ]; - meta = { platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; |