1 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/desktops/kde-5/plasma/kwin/default.nix b/pkgs/desktops/kde-5/plasma/kwin/default.nix
index d121ba84dd00..7af947bcfe8e 100644
--- a/pkgs/desktops/kde-5/plasma/kwin/default.nix
+++ b/pkgs/desktops/kde-5/plasma/kwin/default.nix
@@ -1,11 +1,12 @@
-{ plasmaPackage, ecm, kdoctools, epoxy
-, kactivities, kcompletion, kcmutils, kconfig, kconfigwidgets
-, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel
-, ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications
-, kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem
-, kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative
-, qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor
-, makeQtWrapper
+{
+  plasmaPackage, lib, copyPathsToStore,
+  ecm, kdoctools,
+  breeze-qt5, epoxy, kactivities, kcompletion, kcmutils, kconfig,
+  kconfigwidgets, kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel,
+  ki18n, kiconthemes, kidletime, kinit, kio, knewstuff, knotifications,
+  kpackage, kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem,
+  kxmlgui, libinput, libICE, libSM, plasma-framework, qtdeclarative,
+  qtmultimedia, qtscript, qtx11extras, udev, wayland, xcb-util-cursor, xwayland
 }:
 
 plasmaPackage {
@@ -15,13 +16,17 @@ plasmaPackage {
     kdoctools
   ];
   propagatedBuildInputs = [
-    kactivities kdeclarative kglobalaccel ki18n kio kscreenlocker kwindowsystem
-    plasma-framework qtdeclarative qtmultimedia qtx11extras epoxy kcompletion
-    kcmutils kconfig kconfigwidgets kcoreaddons kcrash kdecoration kiconthemes
-    kidletime kinit knewstuff knotifications kpackage kservice kwayland
-    kwidgetsaddons kxmlgui libinput libICE libSM qtscript udev wayland
-    xcb-util-cursor
+    breeze-qt5 epoxy kactivities kcmutils kcompletion kconfig kconfigwidgets
+    kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
+    kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
+    kwayland kwidgetsaddons kwindowsystem kxmlgui libinput libICE libSM
+    plasma-framework qtdeclarative qtmultimedia qtscript qtx11extras udev
+    wayland xcb-util-cursor
   ];
-  patches = [ ./0001-qdiriterator-follow-symlinks.patch ];
+  patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);
+  postPatch = ''
+    substituteInPlace main_wayland.cpp \
+        --subst-var-by xwayland ${lib.getBin xwayland}/bin/Xwayland
+  '';
   cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ];
 }