From 2e6b1730321d0c7e1525f2807f3e0f845c0fac4c Mon Sep 17 00:00:00 2001
From: Armijn Hemel <armijn@gpl-violations.org>
Date: Wed, 23 Dec 2009 21:05:29 +0000
Subject: [PATCH] update to 2.6.4. voice and video are not working atm
svn path=/nixpkgs/trunk/; revision=19086
---
.../networking/instant-messengers/pidgin/default.nix | 12 ++++++------
pkgs/top-level/all-packages.nix | 2 +-
2 files changed, 7 insertions(+), 7 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 = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 39a77600e7d5..a69ba805530d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7250,7 +7250,7 @@ let
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr
- gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool;
+ 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;
GStreamer = gst_all.gstreamer;