From 47973f8432fce41189963d091d2c3e31cb50fd1d Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 26 Apr 2026 15:52:00 +0300 Subject: [PATCH] quassel: drop KF5 build --- .../networking/irc/quassel/default.nix | 26 +------------------ pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 2 insertions(+), 27 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 46ae3e118578..a716025225ad 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -16,20 +16,9 @@ boost, zlib, qtscript, - phonon, libdbusmenu, qca-qt5, openldap, - - withKDE ? true, # enable KDE integration - extra-cmake-modules, - kconfigwidgets, - kcoreaddons, - knotifications, - knotifyconfig, - ktextwidgets, - kwidgetsaddons, - kxmlgui, }: let @@ -39,7 +28,6 @@ in assert monolithic -> !client && !enableDaemon; assert client || enableDaemon -> !monolithic; -assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [ ("-D" + feature + (if flag then "=ON" else "=OFF")) ]; @@ -76,17 +64,6 @@ stdenv.mkDerivation rec { ] ++ lib.optionals buildClient [ libdbusmenu - phonon - ] - ++ lib.optionals (buildClient && withKDE) [ - extra-cmake-modules - kconfigwidgets - kcoreaddons - knotifications - knotifyconfig - ktextwidgets - kwidgetsaddons - kxmlgui ]; cmakeFlags = [ @@ -97,8 +74,7 @@ stdenv.mkDerivation rec { ++ edf monolithic "WANT_MONO" ++ edf enableDaemon "WANT_CORE" ++ edf enableDaemon "WITH_LDAP" - ++ edf client "WANT_QTCLIENT" - ++ edf withKDE "WITH_KDE"; + ++ edf client "WANT_QTCLIENT"; dontWrapQtApps = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b08f79fff192..4299a06ceacb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10094,13 +10094,12 @@ with pkgs; quasselClient = quassel.override { monolithic = false; client = true; - tag = "-client-kf5"; + tag = "-client-qt5"; }; quasselDaemon = quassel.override { monolithic = false; enableDaemon = true; - withKDE = false; tag = "-daemon-qt5"; };