Options to remove OpenSSL and use gnuTLS for Pidgin (reported to work better with, say, Amessage or any other XMPP server which requires strong channel encryption)

svn path=/nixpkgs/trunk/; revision=12813
This commit is contained in:
Michael Raskin 2008-09-06 10:30:55 +00:00
parent 6c4a6e83b4
commit de45b13c79
2 changed files with 15 additions and 5 deletions

View File

@ -12,8 +12,11 @@
*/
{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
GStreamer, startupnotification, gettext,
perl, perlXMLParser, libxml2, openssl, nss,
perl, perlXMLParser, libxml2, nss,
libXScrnSaver, ncurses, avahi, dbus, dbus_glib
, lib
, openssl ? null
, gnutls ? null
} :
stdenv.mkDerivation {
@ -27,10 +30,15 @@ stdenv.mkDerivation {
buildInputs = [
gtkspell aspell
GStreamer startupnotification
libxml2 openssl nss
libxml2]
++ (lib.optional (openssl != null) openssl)
++ (lib.optional (gnutls != null) gnutls)
++
[nss
libXScrnSaver ncurses
avahi dbus dbus_glib
];
]
;
propagatedBuildInputs = [
pkgconfig gtk perl perlXMLParser gettext

View File

@ -6576,8 +6576,10 @@ let
};
pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss
gtkspell aspell gettext ncurses avahi dbus dbus_glib;
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss
gtkspell aspell gettext ncurses avahi dbus dbus_glib lib;
openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null;
gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;
GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk;
inherit (gnome) startupnotification;