diff options
| author | nyanloutre <paul@nyanlout.re> | 2019-07-29 16:22:49 +0200 |
|---|---|---|
| committer | nyanloutre <paul@nyanlout.re> | 2019-08-16 11:26:17 +0200 |
| commit | ea1131fc39bf314b8615f448fe9bec94f739bc7c (patch) | |
| tree | 60bf6ffadec4f0acf3e85f32f0fbe928ee976407 /pkgs/desktops/plasma-5 | |
| parent | 357ae3c88403770f734cdeb92d0cee2050962463 (diff) | |
kwin: fix xwayland patch
The Xwayland code path was moved from ApplicationWayland to a dedicated
class
https://phabricator.kde.org/D15020
Diffstat (limited to 'pkgs/desktops/plasma-5')
| -rw-r--r-- | pkgs/desktops/plasma-5/kwin/xwayland.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/desktops/plasma-5/kwin/xwayland.patch b/pkgs/desktops/plasma-5/kwin/xwayland.patch index 51f15c87d274..9d405b3bbb86 100644 --- a/pkgs/desktops/plasma-5/kwin/xwayland.patch +++ b/pkgs/desktops/plasma-5/kwin/xwayland.patch @@ -1,13 +1,13 @@ -Index: kwin-5.7.3/main_wayland.cpp +Index: kwin-5.15.5/xwl/xwayland.cpp =================================================================== ---- kwin-5.7.3.orig/main_wayland.cpp -+++ kwin-5.7.3/main_wayland.cpp -@@ -315,7 +315,7 @@ void ApplicationWayland::startXwaylandSe +--- kwin-5.15.5.orig/xwl/xwayland.cpp ++++ kwin-5.15.5/xwl/xwayland.cpp +@@ -143,7 +143,7 @@ void Xwayland::init() - m_xwaylandProcess = new Process(kwinApp()); + m_xwaylandProcess = new Process(this); m_xwaylandProcess->setProcessChannelMode(QProcess::ForwardedErrorChannel); - m_xwaylandProcess->setProgram(QStringLiteral("Xwayland")); + m_xwaylandProcess->setProgram(QLatin1String(NIXPKGS_XWAYLAND)); - QProcessEnvironment env = m_environment; + QProcessEnvironment env = m_app->processStartupEnvironment(); env.insert("WAYLAND_SOCKET", QByteArray::number(wlfd)); - m_xwaylandProcess->setProcessEnvironment(env); + env.insert("EGL_PLATFORM", QByteArrayLiteral("DRM")); |