git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #139537 from CertainLach/plasma5-load-kwayland-integration

plasma5: load kwayland-integration plugin

commitbf84010052ebf0396465f66ca6a544daf52cf9e8 authorThomas Tuegel <ttuegel@mailbox.org> dateWed 29 Sep 2021, 20:32 (5 years ago) parentd408c22de5ffe5
3 files changed+1−56
nixos/modules/services/x11/desktop-managers/plasma5.nix+1 pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch−50 pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix−6
nixos/modules/services/x11/desktop-managers/plasma5.nix+1
@@ -264,6 +264,7 @@ in
264264 kwallet-pam
265265 kwalletmanager
266266 kwayland
267+ kwayland-integration
267268 kwidgetsaddons
268269 kxmlgui
269270 kxmlrpcclient
pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patchdeleted−50
@@ -1,50 +0,0 @@
1−From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001
2−From: Thomas Tuegel <ttuegel@mailbox.org>
3−Date: Wed, 9 Dec 2020 10:01:59 -0600
4−Subject: [PATCH] platform plugins path
5−
6−---
7− src/pluginwrapper.cpp | 27 +++++++++++++--------------
8− 1 file changed, 13 insertions(+), 14 deletions(-)
9−
10−diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp
11−index a255d83..9699b08 100644
12−--- a/src/pluginwrapper.cpp
13−+++ b/src/pluginwrapper.cpp
14−@@ -25,20 +25,19 @@ static QStringList pluginCandidates()
15− {
16− QStringList ret;
17− const auto paths = QCoreApplication::libraryPaths();
18−- for (const QString &path : paths) {
19−- static const QStringList searchFolders{
20−- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
21−- QStringLiteral("/kf5/kwindowsystem"),
22−- };
23−- for (const QString &searchFolder : searchFolders) {
24−- QDir pluginDir(path + searchFolder);
25−- if (!pluginDir.exists()) {
26−- continue;
27−- }
28−- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
29−- for (const QString &entry : entries) {
30−- ret << pluginDir.absoluteFilePath(entry);
31−- }
32−+ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH);
33−+ static const QStringList searchFolders {
34−+ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"),
35−+ QStringLiteral("/kf5/kwindowsystem"),
36−+ };
37−+ for (const QString &searchFolder : searchFolders) {
38−+ QDir pluginDir(path + searchFolder);
39−+ if (!pluginDir.exists()) {
40−+ continue;
41−+ }
42−+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot);
43−+ for (const QString &entry : entries) {
44−+ ret << pluginDir.absoluteFilePath(entry);
45− }
46− }
47− return ret;
48−--
49−2.28.0
50−
pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix−6
@@ -10,11 +10,5 @@ mkDerivation {
1010 nativeBuildInputs = [ extra-cmake-modules ];
1111 buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
1212 propagatedBuildInputs = [ qtbase ];
13− patches = [
14− ./0001-platform-plugins-path.patch
15− ];
16− preConfigure = ''
17− NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
18− '';
1913 outputs = [ "out" "dev" ];
2014}