BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

quassel: 0.10.0 -> 0.11.0

Browse source
This commit is contained in:
William A. Kennington III 2014-10-24 16:39:37 -07:00
parent c5f3b32ac5
commit 9c064a72de
2 changed files with 29 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/networking/irc/quassel/default.nix
View file

@ -5,14 +5,17 @@
, 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, qt4, kdelibs, automoc4, phonon, dconf }:
, stdenv, fetchurl, cmake, makeWrapper, qt, kdelibs, automoc4, phonon, dconf }:
assert monolithic -> !client && !daemon;
assert client || daemon -> !monolithic;
let
edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))];
in with stdenv; mkDerivation rec {
version = "0.10.1";
version = "0.11.0";
name = "quassel${tag}-${version}";
src = fetchurl {
@ -22,7 +25,7 @@ in with stdenv; mkDerivation rec {
enableParallelBuilding = true;
buildInputs = [ cmake makeWrapper qt4 ]
buildInputs = [ cmake makeWrapper qt ]
++ lib.optional withKDE kdelibs
++ lib.optional withKDE automoc4
++ lib.optional withKDE phonon;
@ -63,6 +66,6 @@ in with stdenv; mkDerivation rec {
license = stdenv.lib.licenses.gpl3;
maintainers = [ maintainers.phreedom ];
repositories.git = https://github.com/quassel/quassel.git;
inherit (qt4.meta) platforms;
inherit (qt.meta) platforms;
};
}

23
pkgs/top-level/all-packages.nix
View file

@ -11528,27 +11528,48 @@ let
qtcurve = callPackage ../misc/themes/qtcurve { };
quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; };
quassel = callPackage ../applications/networking/irc/quassel rec {
monolithic = true;
daemon = false;
client = false;
withKDE = stdenv.isLinux;
qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
dconf = gnome3.dconf;
};
quasselWithoutKDE = (self.quassel.override {
monolithic = true;
daemon = false;
client = false;
withKDE = false;
qt = qt5;
tag = "-without-kde";
});
quasselDaemon = (self.quassel.override {
monolithic = false;
daemon = true;
client = false;
withKDE = false;
qt = qt5;
tag = "-daemon";
});
quasselClient = (self.quassel.override {
monolithic = false;
daemon = false;
client = true;
withKDE = stdenv.isLinux;
qt = if withKDE then qt4 else qt5; # KDE supported quassel cannot build with qt5 yet (maybe in 0.12.0)
tag = "-client";
});
quasselClientWithoutKDE = (self.quasselClient.override {
monolithic = false;
daemon = false;
client = true;
withKDE = false;
qt = qt5;
tag = "-client-without-kde";
});