diff options
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
6 files changed, 17 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8584eb84273d..82d11e02fe1d 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk -, ldns, pyopenssl, pythonDBus, pythonPackages +, ldns, pythonDBus, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp - pyopenssl pythonDBus + pythonPackages.pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 362bf0de9774..4fda2d9cc066 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr}: stdenv.mkDerivation rec { name = "mcabber-${version}"; @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; + sha256 = "0vgsqw6yn0lzzcnr4fql4ycgf3gwqj6w4p0l4nqnvhkc94w62ikp"; }; - buildInputs = [openssl ncurses pkgconfig glib loudmouth]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth libotr]; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; meta = with stdenv.lib; { homepage = http://mcabber.com/; diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix index 7cbc38ea0dc0..2fa7d5f37f24 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/otr/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, libotr, pidgin, intltool } : stdenv.mkDerivation rec { - name = "pidgin-otr-4.0.0"; + name = "pidgin-otr-4.0.1"; src = fetchurl { url = "http://www.cypherpunks.ca/otr/${name}.tar.gz"; - sha256 = "14a6vxvlkm8wazng9aj7p82dr12857fx5is1frcyd7my5l4kysym"; + sha256 = "02pkkf86fh5jvzsdn9y78impsgzj1n0p81kc2girvk3vq941yy0v"; }; postInstall = "ln -s \$out/lib/pidgin \$out/share/pidgin-otr"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 32004496534f..5e8f266930ff 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -12,11 +12,12 @@ stdenv.mkDerivation rec { name = "pidgin-${version}"; - version = "2.10.10"; + majorVersion = "2"; + version = "${majorVersion}.10.11"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; - sha256 = "0bc2bk2g3w90mpz9sn9j95c71z4i2i3wxaqa2zpmmixf5r8rasyw"; + sha256 = "01s0q30qrjlzj7kkz6f8lvrwsdd55a9yjh2xjjwyyxzw849j3bpj"; }; inherit nss ncurses; @@ -51,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 0c498dd612e1..7e637c767cfa 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -17,7 +17,7 @@ drv = buildEnv { done fi wrapProgram $out/bin/pidgin \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ ${toString extraArgs} ''; }; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 3870533aa89b..8a3e7203f265 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, makeWrapper, zlib, glib, libpng, freetype, xorg , fontconfig, xlibs, qt5, xkeyboard_config, alsaLib, pulseaudio ? null -, libredirect, quazip +, libredirect, quazip, less, which }: let @@ -33,11 +33,11 @@ stdenv.mkDerivation rec { else "1b3nbvfpd8lx3dig8z5yk6zjkbmsy6y938dhj1f562wc8adixciz"; }; - buildInputs = [ makeWrapper ]; + buildInputs = [ makeWrapper less which ]; unpackPhase = '' - yes | sh $src + echo -e 'q\ny' | sh -xe $src cd TeamSpeak* ''; |