diff options
| author | William A. Kennington III <william@wkennington.com> | 2014-10-24 16:39:37 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2014-10-27 15:16:24 -0700 |
| commit | 9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e (patch) | |
| tree | 0cb0956b1563257439e254085281e86f77987fac /pkgs/applications/networking | |
| parent | c5f3b32ac5d51351511a4b2eaecfaedfea068104 (diff) | |
| download | nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.tar nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.tar.gz nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.tar.bz2 nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.tar.lz nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.tar.xz nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.tar.zst nixlib-9c064a72dee0ddaa108dfc5e8776b5e5ee681e1e.zip | |
quassel: 0.10.0 -> 0.11.0
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index f3fd39e84a72..10d93994bade 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -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; }; } |