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

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)

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -6576,8 +6576,10 @@ let
}; };
pidgin = import ../applications/networking/instant-messengers/pidgin { pidgin = import ../applications/networking/instant-messengers/pidgin {
inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 openssl nss inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss
gtkspell aspell gettext ncurses avahi dbus dbus_glib; 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; GStreamer = gst_all.gstreamer;
inherit (gtkLibs) gtk; inherit (gtkLibs) gtk;
inherit (gnome) startupnotification; inherit (gnome) startupnotification;