update to 2.6.5, also add python dependency for extensions and all that

svn path=/nixpkgs/trunk/; revision=19352
This commit is contained in:
Armijn Hemel 2010-01-11 13:25:05 +00:00
parent cdc307536c
commit 577f4d8325
2 changed files with 6 additions and 6 deletions

View file

@ -14,17 +14,17 @@
GStreamer, gstPluginsBase, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr, farsight2,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib
, lib, python
, openssl ? null
, gnutls ? null
, voice ? null
} :
stdenv.mkDerivation {
name = "pidgin-2.6.4";
name = "pidgin-2.6.5";
src = fetchurl {
url = mirror://sourceforge/pidgin/pidgin-2.6.4.tar.bz2;
sha256 = "04dyr2g45i3wr67zsn04pjl6vyvic8dchb73pajf823pa377m47s";
url = mirror://sourceforge/pidgin/pidgin-2.6.5.tar.bz2;
sha256 = "03ix5w1dr1hl98qh1jmp5dgv2i8f9bd39sim3rcpk9pwjd09wi9w";
};
inherit nss ncurses;
@ -36,7 +36,7 @@ stdenv.mkDerivation {
++ (lib.optional (gnutls != null) gnutls)
++
[nss nspr farsight2
libXScrnSaver ncurses
libXScrnSaver ncurses python
avahi dbus dbus_glib intltool libidn
]
;

View file

@ -7431,7 +7431,7 @@ let
};
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr farsight2 python
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool libidn;
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;