nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-08-26 02:05:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #200872 from lorenz/backport-qt5-popup-patch

Browse Source
This commit is contained in:
Bernardo Meurer
2022-11-12 14:05:22 -05:00
committed by GitHub
parent 9295782ba2 fd94629a32
commit 6a01be6d88
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config }:
{ qtModule, qtbase, qtquickcontrols, wayland, pkg-config, fetchpatch }:
qtModule {
pname = "qtwayland";
@@ -11,5 +11,13 @@ qtModule {
# wrapped executables from `wrapQtAppsHook` (see comment in patch for further
# context). Beware: shared among different Qt5 versions.
./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=";
})
];
}