diff options
author | Armijn Hemel <armijn@gpl-violations.org> | 2009-12-23 21:05:29 +0000 |
---|---|---|
committer | Armijn Hemel <armijn@gpl-violations.org> | 2009-12-23 21:05:29 +0000 |
commit | 2e6b1730321d0c7e1525f2807f3e0f845c0fac4c (patch) | |
tree | 2cf94489a0a84e42d1523f4117582e3f74309e84 /pkgs/applications | |
parent | 01e8f02ce032f7e0e1f974226512e37d58a9e27d (diff) | |
download | nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.tar nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.tar.gz nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.tar.bz2 nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.tar.lz nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.tar.xz nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.tar.zst nixlib-2e6b1730321d0c7e1525f2807f3e0f845c0fac4c.zip |
update to 2.6.4. voice and video are not working atm
svn path=/nixpkgs/trunk/; revision=19086
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cd27f42e221d..cda64d2180d3 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -13,17 +13,17 @@ { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell, GStreamer, startupnotification, gettext, perl, perlXMLParser, libxml2, nss, nspr, - libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool + libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn , lib , openssl ? null , gnutls ? null } : stdenv.mkDerivation { - name = "pidgin-2.5.6"; + name = "pidgin-2.6.4"; src = fetchurl { - url = mirror://sourceforge/pidgin/pidgin-2.5.6.tar.bz2; - sha256 = "00lsb0pmz1zn37xzwji91izzklr9famm100al612m4hy0i37yh4v"; + url = mirror://sourceforge/pidgin/pidgin-2.6.4.tar.bz2; + sha256 = "04dyr2g45i3wr67zsn04pjl6vyvic8dchb73pajf823pa377m47s"; }; inherit nss ncurses; @@ -36,7 +36,7 @@ stdenv.mkDerivation { ++ [nss nspr libXScrnSaver ncurses - avahi dbus dbus_glib intltool + avahi dbus dbus_glib intltool libidn ] ; @@ -44,7 +44,7 @@ stdenv.mkDerivation { pkgconfig gtk perl perlXMLParser gettext ]; - configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl" + configureFlags="--with-nspr-includes=${nspr}/include/nspr --with-nspr-libs=${nspr}/lib --with-nss-includes=${nss}/include/nss --with-nss-libs=${nss}/lib --with-ncurses-headers=${ncurses}/include --disable-meanwhile --disable-nm --disable-tcl --disable-vv" + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") ; meta = { |