diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index 2cfadf85c935..30a5b5c45b36 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -312,6 +312,7 @@ let
             desktop-file-utils
             docbook5
             docbook_xsl_ns
+            kmod.dev
             libxml2.bin
             libxslt.bin
             nixos-artwork.wallpapers.simple-dark-gray-bottom
diff --git a/pkgs/applications/kde/kitinerary.nix b/pkgs/applications/kde/kitinerary.nix
index 83763ba965af..f69e705bb2f9 100644
--- a/pkgs/applications/kde/kitinerary.nix
+++ b/pkgs/applications/kde/kitinerary.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, fetchpatch, lib, extra-cmake-modules
+{ mkDerivation, lib, extra-cmake-modules
 , qtdeclarative, ki18n, kmime, kpkpass
 , poppler, kcontacts, kcalendarcore
 , shared-mime-info
@@ -10,15 +10,6 @@ mkDerivation {
     license = with lib.licenses; [ lgpl21 ];
     maintainers = [ lib.maintainers.bkchr ];
   };
-
-  patches = [
-    # Fix build with poppler 22.03
-    (fetchpatch {
-      url = "https://github.com/KDE/kitinerary/commit/e21d1ffc5fa81a636245f49c97fe7cda63abbb1d.patch";
-      sha256 = "1/zgq9QIOCPplqplDqgpoqzuYFf/m1Ixxawe50t2F04=";
-    })
-  ];
-
   nativeBuildInputs = [
     extra-cmake-modules
     shared-mime-info # for update-mime-database
diff --git a/pkgs/development/libraries/qt-5/5.12/default.nix b/pkgs/development/libraries/qt-5/5.12/default.nix
index 01b65eb3e43a..a3664ae9e055 100644
--- a/pkgs/development/libraries/qt-5/5.12/default.nix
+++ b/pkgs/development/libraries/qt-5/5.12/default.nix
@@ -84,6 +84,12 @@ let
     qtlocation = [ ./qtlocation-gcc-9.patch ];
     qtscript = [ ./qtscript.patch ];
     qtserialport = [ ./qtserialport.patch ];
+    qtwayland = [
+      # 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.
+      ../modules/qtwayland-app_id.patch
+    ];
     qtwebengine = [
       # glibc 2.34 compat
       (fetchpatch {
diff --git a/pkgs/development/libraries/qt-5/5.14/default.nix b/pkgs/development/libraries/qt-5/5.14/default.nix
index 5a3bf205fbce..15c85961adcf 100644
--- a/pkgs/development/libraries/qt-5/5.14/default.nix
+++ b/pkgs/development/libraries/qt-5/5.14/default.nix
@@ -126,7 +126,13 @@ let
       ./qtwebkit-darwin-no-qos-classes.patch
     ];
     qttools = [ ./qttools.patch ];
-    qtwayland = [ ./qtwayland-libdrm-build.patch ];
+    qtwayland = [
+      ./qtwayland-libdrm-build.patch
+      # 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.
+      ../modules/qtwayland-app_id.patch
+    ];
   };
 
   addPackages = self: with self;
diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 5943a80a701e..946c196f4a2d 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -60,6 +60,12 @@ let
       ./qtwebengine-darwin-no-platform-check.patch
       ./qtwebengine-mac-dont-set-dsymutil-path.patch
     ];
+    qtwayland = [
+      # 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.
+      ../modules/qtwayland-app_id.patch
+    ];
     qtwebkit = [
       (fetchpatch {
         name = "qtwebkit-bison-3.7-build.patch";
diff --git a/pkgs/development/libraries/qt-5/modules/qtwayland.nix b/pkgs/development/libraries/qt-5/modules/qtwayland.nix
index edb15b0b48b1..1bd1adedaf04 100644
--- a/pkgs/development/libraries/qt-5/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-5/modules/qtwayland.nix
@@ -6,10 +6,4 @@ qtModule {
   buildInputs = [ wayland ];
   nativeBuildInputs = [ pkg-config ];
   outputs = [ "out" "dev" "bin" ];
-  patches = [
-    # NixOS-specific, ensure that app_id is correctly determined for
-    # wrapped executables from `wrapQtAppsHook` (see comment in patch for further
-    # context).
-    ./qtwayland-app_id.patch
-  ];
 }