BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

qt*.qtwayland: fix build of versions before 5.15

Browse source 
/cc the PR adding this patch: #200872
This commit is contained in:
Vladimír Čunát 2022-11-18 17:24:02 +01:00
parent dd63e72ef2
commit d10e3216b8
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/libraries/qt-5/modules/qtwayland.nix
View file

@ -1,4 +1,4 @@
{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }:
{ lib, qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }:
qtModule {
pname = "qtwayland";
@ -11,13 +11,14 @@ qtModule {
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further
# context). Beware: shared among different Qt5 versions.
./qtwayland-app_id.patch
] ++ lib.optional (lib.versionAtLeast qtbase.version "5.15")
# 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
# This patch won't apply to versions before 5.15.
(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=";
})
];
});
}