qt5*.qtwayland: deconflict patching
This fixes build in qt514 case.
The usual way here is to provide patches for each qt5 version
separately. No other module adds them in this generic way.
The problem is when you combine the approaches; qtModule will only
take the list from the module and ignore the version-specific list.
commitdb57a90dccb2b0fc0b6d5302f08365db1e4db81e
authorVladimír Čunát <v@cunat.cz>
dateTue 5 Apr 2022, 15:11 (5 years ago)
parent249aa8d
pkgs/development/libraries/qt-5/5.12/default.nix+6
@@ -84,6 +84,12 @@ let
8484 qtlocation = [ ./qtlocation-gcc-9.patch ];
8585 qtscript = [ ./qtscript.patch ];
8686 qtserialport = [ ./qtserialport.patch ];
87+ qtwayland = [
88+ # NixOS-specific, ensure that app_id is correctly determined for
89+ # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
90+ # context). Beware: shared among different Qt5 versions.
91+ ../modules/qtwayland-app_id.patch
92+ ];
8793 qtwebengine = [
8894 # glibc 2.34 compat
8995 (fetchpatch {
pkgs/development/libraries/qt-5/5.14/default.nix+7−1
@@ -126,7 +126,13 @@ let
126126 ./qtwebkit-darwin-no-qos-classes.patch
127127 ];
128128 qttools = [ ./qttools.patch ];
129− qtwayland = [ ./qtwayland-libdrm-build.patch ];
129+ qtwayland = [
130+ ./qtwayland-libdrm-build.patch
131+ # NixOS-specific, ensure that app_id is correctly determined for
132+ # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
133+ # context). Beware: shared among different Qt5 versions.
134+ ../modules/qtwayland-app_id.patch
135+ ];
130136 };
131137
132138 addPackages = self: with self;
pkgs/development/libraries/qt-5/5.15/default.nix+6
@@ -60,6 +60,12 @@ let
6060 ./qtwebengine-darwin-no-platform-check.patch
6161 ./qtwebengine-mac-dont-set-dsymutil-path.patch
6262 ];
63+ qtwayland = [
64+ # NixOS-specific, ensure that app_id is correctly determined for
65+ # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
66+ # context). Beware: shared among different Qt5 versions.
67+ ../modules/qtwayland-app_id.patch
68+ ];
6369 qtwebkit = [
6470 (fetchpatch {
6571 name = "qtwebkit-bison-3.7-build.patch";
pkgs/development/libraries/qt-5/modules/qtwayland.nix−6
@@ -6,10 +6,4 @@ qtModule {
66 buildInputs = [ wayland ];
77 nativeBuildInputs = [ pkg-config ];
88 outputs = [ "out" "dev" "bin" ];
9− patches = [
10− # NixOS-specific, ensure that app_id is correctly determined for
11− # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
12− # context).
13− ./qtwayland-app_id.patch
14− ];
159}