From da5f04dd9eed43128f4e0b4283513304ad27ea82 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 5 Apr 2023 12:38:45 +0300 Subject: [PATCH] qt5/qtwayland: drop merged patch --- .../libraries/qt-5/modules/qtwayland.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix index c7b61ab11f4b..edb15b0b48b1 100644 --- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix +++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix @@ -1,4 +1,4 @@ -{ lib, qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }: +{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }: qtModule { pname = "qtwayland"; @@ -9,16 +9,7 @@ qtModule { patches = [ # NixOS-specific, ensure that app_id is correctly determined for # wrapped executables from `wrapQtAppsHook` (see comment in patch for further - # context). Beware: shared among different Qt5 versions. + # context). ./qtwayland-app_id.patch - - # Backport of https://codereview.qt-project.org/c/qt/qtwayland/+/388338 - # Pulled from Fedora as they modified it to not apply to KDE as Plasma 5.x - # doesn't behave properly with the patch applied. See the discussion at - # https://invent.kde.org/qt/qt/qtwayland/-/merge_requests/39 for details - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/qt5-qtwayland/raw/46376bb00d4c3dd3db2e82ad7ca5301ce16ea4ab/f/0080-Client-set-constraint-adjustments-for-popups-in-xdg.patch"; - sha256 = "sha256-XP+noYCk8fUdA0ItCqMjV7lSXDlNdB7Az9q7NRpupHc="; - }) ]; }