dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #224800 from K900/qtwayland-oops

Browse Source 
qt5/qtwayland: drop merged patch
This commit is contained in:
K900 2023-04-05 13:19:34 +03:00 committed by GitHub
commit f011a8c905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/libraries/qt-5/modules/qtwayland.nix
View File

@ -1,4 +1,4 @@
{ lib, qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }: { qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
qtModule { qtModule {
pname = "qtwayland"; pname = "qtwayland";
@ -9,16 +9,7 @@ qtModule {
patches = [ patches = [
# NixOS-specific, ensure that app_id is correctly determined for # NixOS-specific, ensure that app_id is correctly determined for
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
# context). Beware: shared among different Qt5 versions. # context).
./qtwayland-app_id.patch ./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=";
})
]; ];
} }