diff --git a/nixos/modules/services/x11/desktop-managers/plasma5.nix b/nixos/modules/services/x11/desktop-managers/plasma5.nix index d8dc2675f068b..16b82f972cbd5 100644 --- a/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -264,6 +264,7 @@ in kwallet-pam kwalletmanager kwayland + kwayland-integration kwidgetsaddons kxmlgui kxmlrpcclient diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch b/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch deleted file mode 100644 index 0093eb556bfd4..0000000000000 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 291f691400d4e85c57b57ec75482d2c6078ce26e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Wed, 9 Dec 2020 10:01:59 -0600 -Subject: [PATCH] platform plugins path - ---- - src/pluginwrapper.cpp | 27 +++++++++++++-------------- - 1 file changed, 13 insertions(+), 14 deletions(-) - -diff --git a/src/pluginwrapper.cpp b/src/pluginwrapper.cpp -index a255d83..9699b08 100644 ---- a/src/pluginwrapper.cpp -+++ b/src/pluginwrapper.cpp -@@ -25,20 +25,19 @@ static QStringList pluginCandidates() - { - QStringList ret; - const auto paths = QCoreApplication::libraryPaths(); -- for (const QString &path : paths) { -- static const QStringList searchFolders{ -- QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -- QStringLiteral("/kf5/kwindowsystem"), -- }; -- for (const QString &searchFolder : searchFolders) { -- QDir pluginDir(path + searchFolder); -- if (!pluginDir.exists()) { -- continue; -- } -- const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -- for (const QString &entry : entries) { -- ret << pluginDir.absoluteFilePath(entry); -- } -+ const QString path = QStringLiteral(NIXPKGS_QT_PLUGIN_PATH); -+ static const QStringList searchFolders { -+ QStringLiteral("/kf5/org.kde.kwindowsystem.platforms"), -+ QStringLiteral("/kf5/kwindowsystem"), -+ }; -+ for (const QString &searchFolder : searchFolders) { -+ QDir pluginDir(path + searchFolder); -+ if (!pluginDir.exists()) { -+ continue; -+ } -+ const auto entries = pluginDir.entryList(QDir::Files | QDir::NoDotAndDotDot); -+ for (const QString &entry : entries) { -+ ret << pluginDir.absoluteFilePath(entry); - } - } - return ret; --- -2.28.0 - diff --git a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix index 409293093382d..7643572a7ec02 100644 --- a/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix +++ b/pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix @@ -10,11 +10,5 @@ mkDerivation { nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ]; propagatedBuildInputs = [ qtbase ]; - patches = [ - ./0001-platform-plugins-path.patch - ]; - preConfigure = '' - NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\"" - ''; outputs = [ "out" "dev" ]; }