Skip to content

Commit b76a15f

Browse files
authored
kdePackages.kwayland-integration: fix build, use in Plasma 6 (#435663)
2 parents 70f4bbe + 0951589 commit b76a15f

File tree

2 files changed

+40
-5
lines changed

2 files changed

+40
-5
lines changed

nixos/modules/services/desktop-managers/plasma6.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ in
183183
++ lib.optionals config.services.desktopManager.plasma6.enableQt5Integration [
184184
breeze.qt5
185185
plasma-integration.qt5
186-
pkgs.plasma5Packages.kwayland-integration
186+
kwayland-integration
187187
(
188188
# Only symlink the KIO plugins, so we don't accidentally pull any services
189189
# like KCMs or kcookiejar
Lines changed: 39 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,41 @@
1-
{ mkKdeDerivation }:
2-
mkKdeDerivation {
1+
{
2+
stdenv,
3+
sources,
4+
5+
cmake,
6+
pkg-config,
7+
libsForQt5,
8+
wayland-scanner,
9+
10+
plasma-wayland-protocols,
11+
wayland,
12+
wayland-protocols,
13+
}:
14+
# not mkKdeDerivation because this is Qt5 land
15+
stdenv.mkDerivation rec {
316
pname = "kwayland-integration";
4-
# FIXME(qt5)
5-
meta.broken = true;
17+
inherit (sources.${pname}) version;
18+
19+
src = sources.${pname};
20+
21+
nativeBuildInputs = [
22+
cmake
23+
pkg-config
24+
libsForQt5.extra-cmake-modules
25+
];
26+
27+
buildInputs = [
28+
libsForQt5.qtbase
29+
libsForQt5.qtwayland
30+
31+
libsForQt5.kwayland
32+
libsForQt5.kwindowsystem
33+
34+
plasma-wayland-protocols
35+
wayland
36+
wayland-protocols
37+
wayland-scanner
38+
];
39+
40+
dontWrapQtApps = true;
641
}

0 commit comments

Comments
 (0)