public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to 2.6.4. voice and video are not working atm

Browse Source 
svn path=/nixpkgs/trunk/; revision=19086
This commit is contained in:
Armijn Hemel 2009-12-23 21:05:29 +00:00
parent 01e8f02ce0
commit 2e6b173032
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View File

@ -13,17 +13,17 @@
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell, { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, startupnotification, gettext, GStreamer, startupnotification, gettext,
perl, perlXMLParser, libxml2, nss, nspr, perl, perlXMLParser, libxml2, nss, nspr,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
, lib , lib
, openssl ? null , openssl ? null
, gnutls ? null , gnutls ? null
} : } :
stdenv.mkDerivation { stdenv.mkDerivation {
name = "pidgin-2.5.6"; name = "pidgin-2.6.4";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/pidgin/pidgin-2.5.6.tar.bz2; url = mirror://sourceforge/pidgin/pidgin-2.6.4.tar.bz2;
sha256 = "00lsb0pmz1zn37xzwji91izzklr9famm100al612m4hy0i37yh4v"; sha256 = "04dyr2g45i3wr67zsn04pjl6vyvic8dchb73pajf823pa377m47s";
}; };
inherit nss ncurses; inherit nss ncurses;
@ -36,7 +36,7 @@ stdenv.mkDerivation {
++ ++
[nss nspr [nss nspr
libXScrnSaver ncurses libXScrnSaver ncurses
avahi dbus dbus_glib intltool avahi dbus dbus_glib intltool libidn
] ]
; ;
@ -44,7 +44,7 @@ stdenv.mkDerivation {
pkgconfig gtk perl perlXMLParser gettext 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") + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
; ;
meta = { meta = {

2
pkgs/top-level/all-packages.nix
View File

@ -7250,7 +7250,7 @@ let
pidgin = import ../applications/networking/instant-messengers/pidgin { pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr 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; openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;
GStreamer = gst_all.gstreamer; GStreamer = gst_all.gstreamer;