diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index b66680a147bb..cd27f42e221d 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -12,7 +12,7 @@ */ { stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell, GStreamer, startupnotification, gettext, - perl, perlXMLParser, libxml2, nss, + perl, perlXMLParser, libxml2, nss, nspr, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool , lib , openssl ? null @@ -34,7 +34,7 @@ stdenv.mkDerivation { ++ (lib.optional (openssl != null) openssl) ++ (lib.optional (gnutls != null) gnutls) ++ - [nss + [nss nspr libXScrnSaver ncurses avahi dbus dbus_glib intltool ] @@ -44,7 +44,7 @@ stdenv.mkDerivation { pkgconfig gtk perl perlXMLParser gettext ]; - configureFlags="--with-nspr-includes=${nss}/include/nspr --with-nspr-libs=${nss}/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" + (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 1dd2f803065f..f3ef680b94a5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6795,7 +6795,7 @@ let }; pidgin = import ../applications/networking/instant-messengers/pidgin { - inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss + inherit fetchurl stdenv pkgconfig perl perlXMLParser libxml2 nss nspr gtkspell aspell gettext ncurses avahi dbus dbus_glib lib intltool; openssl = if (getConfig ["pidgin" "openssl"] true) then openssl else null; gnutls = if (getConfig ["pidgin" "gnutls"] false) then gnutls else null;