From 5360bbfb6254ae70d4d3c58dffd0db44840d2454 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 19 Jan 2015 11:12:46 -0600 Subject: [PATCH] quassel: add Qt 5 version --- .../networking/irc/quassel/default.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 11 +++++++++++ 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 1349e71a791..5e042579a84 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,10 +5,14 @@ , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, stdenv, fetchurl, cmake, makeWrapper, qt, kdelibs, automoc4, phonon, dconf }: +, kdelibs ? null # optional +, useQt5 ? false +, phonon_qt5, libdbusmenu_qt5 +, stdenv, fetchurl, cmake, makeWrapper, qt, automoc4, phonon, dconf }: assert monolithic -> !client && !daemon; assert client || daemon -> !monolithic; +assert withKDE -> kdelibs != null; let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; @@ -28,20 +32,19 @@ in with stdenv; mkDerivation rec { buildInputs = [ cmake makeWrapper qt ] ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 - ++ lib.optional withKDE phonon; + ++ lib.optional withKDE phonon + ++ lib.optional useQt5 phonon_qt5 + ++ lib.optional useQt5 libdbusmenu_qt5; cmakeFlags = [ - "-DWITH_DBUS=OFF" - "-DWITH_LIBINDICATE=OFF" "-DEMBED_DATA=OFF" - "-DSTATIC=OFF" - "-DWITH_PHONON=ON" ] + "-DSTATIC=OFF" ] ++ edf monolithic "WANT_MONO" ++ edf daemon "WANT_CORE" ++ edf client "WANT_QTCLIENT" ++ edf withKDE "WITH_KDE" - ++ edf ssl "WITH_OPENSSL" - ++ edf previews "WITH_WEBKIT" ; + ++ edf previews "WITH_WEBKIT" + ++ edf useQt5 "USE_QT5"; preFixup = lib.optionalString client '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af9630b1458..12a13788bb4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10899,6 +10899,17 @@ let qtractor = callPackage ../applications/audio/qtractor { }; + quassel_qt5 = callPackage ../applications/networking/irc/quassel { + monolithic = true; + daemon = false; + client = false; + withKDE = false; + useQt5 = true; + qt = qt5; + dconf = gnome3.dconf; + tag = "-qt5"; + }; + quirc = callPackage ../tools/graphics/quirc {}; quodlibet = callPackage ../applications/audio/quodlibet {