From de45b13c79706ab719adabb454e50fe10244a3fd Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 6 Sep 2008 10:30:55 +0000 Subject: [PATCH] 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 --- .../instant-messengers/pidgin/default.nix | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 6 ++++-- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 9a4d29f09b3..0f8526e5a6c 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9e1e4d373f..52e19255cb7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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;