diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
| commit | ff97b7dbe6aef98b105c8af34f19232aa7d49d80 (patch) | |
| tree | b44b52b9a17a84c84d179c1cafd3a3425c62751a /pkgs/applications/networking/irc | |
| parent | 0b82b9532229a28758df482218222d90d910c494 (diff) | |
| parent | b57bc220cc04e3d8f931b604e5acc44544b8c1c0 (diff) | |
| download | nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.gz nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.bz2 nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.lz nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.xz nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.zst nixlib-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/applications/networking/irc')
| -rw-r--r-- | pkgs/applications/networking/irc/quassel/default.nix | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/pkgs/applications/networking/irc/quassel/default.nix b/pkgs/applications/networking/irc/quassel/default.nix index 57cfc928afb9..2a5be53619d7 100644 --- a/pkgs/applications/networking/irc/quassel/default.nix +++ b/pkgs/applications/networking/irc/quassel/default.nix @@ -5,7 +5,7 @@ , ssl ? true # enable SSL support , previews ? false # enable webpage previews on hovering over URLs , tag ? "" # tag added to the package name -, stdenv, fetchurl, cmake, qt4, kdelibs, automoc4, phonon }: +, stdenv, fetchurl, cmake, makeWrapper, qt4, kdelibs, automoc4, phonon, dconf }: let edf = flag: feature: [("-D" + feature + (if flag then "=ON" else "=OFF"))]; @@ -22,7 +22,7 @@ in with stdenv; mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ cmake qt4 ] + buildInputs = [ cmake makeWrapper qt4 ] ++ lib.optional withKDE kdelibs ++ lib.optional withKDE automoc4 ++ lib.optional withKDE phonon; @@ -40,6 +40,11 @@ in with stdenv; mkDerivation rec { ++ edf ssl "WITH_OPENSSL" ++ edf previews "WITH_WEBKIT" ; + preFixup = '' + wrapProgram "$out/bin/quasselclient" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" + ''; + meta = with stdenv.lib; { homepage = http://quassel-irc.org/; description = "Qt4/KDE4 distributed IRC client suppporting a remote daemon"; |