From 0951589765779edcc80bb2a664889f6a537d27c3 Mon Sep 17 00:00:00 2001 From: K900 Date: Fri, 22 Aug 2025 00:05:20 +0300 Subject: [PATCH] kdePackages.kwayland-integration: fix build, use in Plasma 6 This is still the Qt5 version, but we deleted the old Qt5 version along with the rest of Plasma 5 so we need this now. --- .../services/desktop-managers/plasma6.nix | 2 +- .../plasma/kwayland-integration/default.nix | 43 +++++++++++++++++-- 2 files changed, 40 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 12bdb2a6db69..529734bd503f 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -183,7 +183,7 @@ in ++ lib.optionals config.services.desktopManager.plasma6.enableQt5Integration [ breeze.qt5 plasma-integration.qt5 - pkgs.plasma5Packages.kwayland-integration + kwayland-integration ( # Only symlink the KIO plugins, so we don't accidentally pull any services # like KCMs or kcookiejar diff --git a/pkgs/kde/plasma/kwayland-integration/default.nix b/pkgs/kde/plasma/kwayland-integration/default.nix index 8de6d3fae8be..1f4790f09a29 100644 --- a/pkgs/kde/plasma/kwayland-integration/default.nix +++ b/pkgs/kde/plasma/kwayland-integration/default.nix @@ -1,6 +1,41 @@ -{ mkKdeDerivation }: -mkKdeDerivation { +{ + stdenv, + sources, + + cmake, + pkg-config, + libsForQt5, + wayland-scanner, + + plasma-wayland-protocols, + wayland, + wayland-protocols, +}: +# not mkKdeDerivation because this is Qt5 land +stdenv.mkDerivation rec { pname = "kwayland-integration"; - # FIXME(qt5) - meta.broken = true; + inherit (sources.${pname}) version; + + src = sources.${pname}; + + nativeBuildInputs = [ + cmake + pkg-config + libsForQt5.extra-cmake-modules + ]; + + buildInputs = [ + libsForQt5.qtbase + libsForQt5.qtwayland + + libsForQt5.kwayland + libsForQt5.kwindowsystem + + plasma-wayland-protocols + wayland + wayland-protocols + wayland-scanner + ]; + + dontWrapQtApps = true; }