From 1de98e85681e7d1028fe866fa220c05ce1ed842f Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 8 Feb 2018 14:03:33 +0800 Subject: plasma: 5.11.5 -> 5.12.1 --- pkgs/desktops/plasma-5/kwin/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'pkgs/desktops/plasma-5/kwin/default.nix') diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 8b8a5fe72ea2..87a25885b40f 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, + plasma-framework, qtsensors, libcap }: mkDerivation { @@ -21,22 +21,22 @@ mkDerivation { epoxy libICE libSM libinput libxkbcommon udev wayland xcb-util-cursor xwayland - qtdeclarative qtmultimedia qtscript qtx11extras + qtdeclarative qtmultimedia qtscript qtx11extras qtsensors breeze-qt5 kactivities kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kcrash kdeclarative kdecoration kglobalaccel ki18n kiconthemes kidletime kinit kio knewstuff knotifications kpackage kscreenlocker kservice kwayland kwidgetsaddons kwindowsystem kxmlgui plasma-framework + libcap ]; outputs = [ "bin" "dev" "out" ]; - patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) - ++ [(fetchpatch { - name = "cmake-3.10.diff"; - # included upstream for kwin >= 5.11.95 - url = "https://github.com/KDE/kwin/commit/cd544890ced4192.diff"; - sha256 = "0z5nbcg712v10mskb7r9v0jcx5h8q4ixb7fjbb0kicmzsc266yd5"; - })] - ; + patches = copyPathsToStore (lib.readPathsFromFile ./. ./series) ++ [ + # This patch should be removed in 5.12.2 + (fetchpatch { + url = "https://github.com/KDE/kwin/commit/6e5f5d92daab4c60f7bf241d90a91b3bea27acfd.patch"; + sha256 = "1yq9wjvch46z7qx051s0ws0gyqbqhkvx7xl4pymd97vz8v6gnx4x"; + }) + ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' ]; -- cgit 1.4.1