Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

plasma5: load kwayland-integration plugin #139537

Merged
merged 1 commit into from
Sep 30, 2021
Merged

plasma5: load kwayland-integration plugin #139537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nixos/modules/services/x11/desktop-managers/plasma5.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,7 @@ in
kwallet-pam
kwalletmanager
kwayland
kwayland-integration
kwidgetsaddons
kxmlgui
kxmlrpcclient
Expand Down
50 changes: 0 additions & 50 deletions pkgs/development/libraries/kde-frameworks/kwindowsystem/0001-platform-plugins-path.patch
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions pkgs/development/libraries/kde-frameworks/kwindowsystem/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,5 @@ mkDerivation {
nativeBuildInputs = [ extra-cmake-modules ];
buildInputs = [ libpthreadstubs libXdmcp qttools qtx11extras ];
propagatedBuildInputs = [ qtbase ];
patches = [
./0001-platform-plugins-path.patch
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to load kwayland-integration as kwindowmanager plugin, but kwayland-integration depends on kwindowmanager

I see no way here to make it pure

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be possible by finding out what parts of kwindowmanager it depends on exactly and splitting that into a separate output. Or maybe it would be possible to set something up with env variables in the NixOS module?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Might be possible by finding out what parts of kwindowmanager it depends on exactly and splitting that into a separate output

It is pretty much monolithic

Or maybe it would be possible to set something up with env variables in the NixOS module?

Well, it is possible to introduce new env variable in plasma5 nixos module, but this doesn't solve impurity, as environment needs to be propagated :D

];
preConfigure = ''
NIX_CFLAGS_COMPILE+=" -DNIXPKGS_QT_PLUGIN_PATH=\"''${!outputBin}/$qtPluginPrefix\""
'';
outputs = [ "out" "dev" ];
}