diff --git a/nixos/modules/services/networking/quassel.nix b/nixos/modules/services/networking/quassel.nix index 579d62884c7..005eb7bd761 100644 --- a/nixos/modules/services/networking/quassel.nix +++ b/nixos/modules/services/networking/quassel.nix @@ -3,7 +3,7 @@ with lib; let - quassel = pkgs.kde4.quasselDaemon; + quassel = pkgs.quasselDaemon_qt5; cfg = config.services.quassel; user = if cfg.user != null then cfg.user else "quassel"; in diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index a8bd2e801b9..c1944cf6d0d 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -1,20 +1,27 @@ { monolithic ? true # build monolithic Quassel , daemon ? false # build Quassel daemon , client ? false # build Quassel client -, withKDE ? stdenv.isLinux # enable KDE integration , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, kdelibs ? null # optional -, useQt5 ? false -, phonon_qt5, libdbusmenu_qt5 -, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2, qca-qt5 }: +, useQt5 ? false, phonon_qt5, libdbusmenu_qt5, qca-qt5 +, withKDE ? stdenv.isLinux # enable KDE integration +, kf5 ? null, kdelibs ? null +, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf, qca2 }: + +let useKF5 = useQt5 && withKDE; + useKDE4 = withKDE && !useQt5; + buildClient = monolithic || client; + buildCore = monolithic || daemon; +in assert stdenv.isLinux; assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; -assert withKDE -> kdelibs != null; +assert useKDE4 -> kdelibs != null; +assert useKF5 -> kf5 != null; +assert !buildClient -> !withKDE; # KDE is used by the client only let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; @@ -31,15 +38,21 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake makeWrapper ] - ++ (if useQt5 then [ qt.base qca-qt5 ] else [ qt qca2 ]) - ++ (if useQt5 && (monolithic || daemon) then [ qt.script ] else []) - ++ (if useQt5 && previews then [ qt.webkit qt.webkitwidgets ] else []) - ++ lib.optional withKDE kdelibs - ++ lib.optional withKDE automoc4 - ++ lib.optional withKDE phonon - ++ lib.optional useQt5 phonon_qt5 - ++ lib.optional useQt5 libdbusmenu_qt5; + buildInputs = + [ cmake makeWrapper ] + ++ [(if useQt5 then qt.base else qt)] + ++ lib.optionals buildCore (if useQt5 then [qt.script qca-qt5] else [qca2]) + ++ lib.optionals buildClient + ( lib.optionals (previews && useQt5) [qt.webkit qt.webkitwidgets] + ++ lib.optionals useQt5 [libdbusmenu_qt5 phonon_qt5] + ++ lib.optionals useKDE4 [automoc4 kdelibs phonon] + ++ lib.optionals useKF5 + (with kf5; [ + extra-cmake-modules kconfigwidgets kcoreaddons + knotifications knotifyconfig ktextwidgets kwidgetsaddons + kxmlgui + ]) + ); cmakeFlags = [ "-DEMBED_DATA=OFF" @@ -52,24 +65,20 @@ in with stdenv; mkDerivation rec { ++ edf useQt5 "USE_QT5"; preFixup = - lib.optionalString client '' - wrapProgram "$out/bin/quasselclient" \ - --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" - '' + - lib.optionalString monolithic '' - wrapProgram "$out/bin/quassel" \ + lib.optionalString buildClient '' + wrapProgram "$out/bin/quassel${lib.optionalString client "client"}" \ --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; meta = with stdenv.lib; { homepage = http://quassel-irc.org/; - description = "Qt4/KDE4/Qt5 distributed IRC client suppporting a remote daemon"; + description = "Qt/KDE distributed IRC client suppporting a remote daemon"; longDescription = '' Quassel IRC is a cross-platform, distributed IRC client, meaning that one (or multiple) client(s) can attach to and detach from a central core -- much like the popular combination of screen and a text-based IRC client such - as WeeChat, but graphical (based on Qt4/KDE4 or Qt5). + as WeeChat, but graphical (based on Qt4/KDE4 or Qt5/KF5). ''; license = stdenv.lib.licenses.gpl3; maintainers = with maintainers; [ phreedom ttuegel ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9fadac248f..7505c865802 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12478,6 +12478,24 @@ let tag = "-daemon-qt5"; }; + quassel_kf5 = callPackage ../applications/networking/irc/quassel { + monolithic = true; + daemon = false; + client = false; + withKDE = true; + useQt5 = true; + qt = qt5; + kf5 = kf510; + dconf = gnome3.dconf; + tag = "-kf5"; + }; + + quasselClient_kf5 = quassel_kf5.override { + monolithic = false; + client = true; + tag = "-client-kf5"; + }; + quirc = callPackage ../tools/graphics/quirc {}; quodlibet = callPackage ../applications/audio/quodlibet {