From 55ac5df24253ee442ca7c10776804c514ef03363 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Wed, 4 Nov 2020 21:48:35 +0100 Subject: [PATCH] kwin: fixup build by upstream patch --- pkgs/desktops/plasma-5/kwin/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/plasma-5/kwin/default.nix b/pkgs/desktops/plasma-5/kwin/default.nix index 78b6909f046d..e2fb0877ec86 100644 --- a/pkgs/desktops/plasma-5/kwin/default.nix +++ b/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, @@ -37,6 +37,11 @@ mkDerivation { patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch + (fetchpatch { # included in >= 5.18.6 + name = "EGL_TEXTURE_Y_XUXV_WL.diff"; + url = "https://github.com/KDE/kwin/commit/2c76cc478.diff"; + sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"''