From af44ab8400de82ce16bb846164b55fd7b779b230 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 26 Jul 2018 15:23:07 +0200
Subject: [PATCH 1/2] plasma.kwin: Adds libdrm depdency

Libdrm is required to enable the DRM backend that is used by Wayland.
---
 pkgs/desktops/plasma-5/kwin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix
index a0b09e30338..b8f381e9714 100644
--- a/pkgs/desktops/plasma-5/kwin/default.nix
+++ b/pkgs/desktops/plasma-5/kwin/default.nix
@@ -11,7 +11,7 @@
   kcoreaddons, kcrash, kdeclarative, kdecoration, kglobalaccel, ki18n,
   kiconthemes, kidletime, kinit, kio, knewstuff, knotifications, kpackage,
   kscreenlocker, kservice, kwayland, kwidgetsaddons, kwindowsystem, kxmlgui,
-  plasma-framework, qtsensors, libcap
+  plasma-framework, qtsensors, libcap, libdrm
 }:
 
 mkDerivation {
@@ -27,7 +27,7 @@ mkDerivation {
     kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes
     kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice
     kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework
-    libcap
+    libcap libdrm
   ];
   outputs = [ "bin" "dev" "out" ];
   patches = copyPathsToStore (lib.readPathsFromFile ./. ./series);

From 6e5d977b97966c832dfbb51c9dfded86e2bde172 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Thu, 26 Jul 2018 15:24:17 +0200
Subject: [PATCH 2/2] plasma-workspace: Improve the NixOS patch set

We changed some if condition that is not required to be changed.
---
 .../plasma-5/plasma-workspace/plasma-workspace.patch        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
index 272088b72b7..7f45d51d160 100644
--- a/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
+++ b/pkgs/desktops/plasma-5/plasma-workspace/plasma-workspace.patch
@@ -907,10 +907,10 @@ index dd9e304d..49d456e9 100644
 -    }
  fi
  
- kstartupconfig5
+-kstartupconfig5
++@CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5
  returncode=$?
--if test $returncode -ne 0; then
-+if ! @CMAKE_INSTALL_FULL_BINDIR@/kstartupconfig5; then
+ if test $returncode -ne 0; then
      exit 1
  fi
 -[ -r $configDir/startupconfig ] && . $configDir/startupconfig