pidgin: Fix compilation errors, clean up

pkgs/applications/networking/instant-messengers/pidgin/default.nix

@@ -1,49 +1,37 @@
-/**
+{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell
- * Possible missing configuration:
+, gstreamer, gst_plugins_base, startupnotification, gettext
- *
+, perl, perlXMLParser, libxml2, nss, nspr, farsight2
- * - silcclient
+, libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
- * - libebook-1.2
+, lib, python, libICE, libXext, libSM
- * - libedata-book-1.2
+, openssl ? null
- * - checking for XScreenSaverRegister in -lXext... no
+, gnutls ? null
- * - checking for XScreenSaverRegister in -lXss... no
+, libgcrypt ? null
- * - ao
+}:
- * - audiofile-config
- * - doxygen
- */
-{ stdenv, fetchurl, pkgconfig, gtk, gtkspell, aspell,
-  gstreamer, gst_plugins_base, startupnotification, gettext,
-  perl, perlXMLParser, libxml2, nss, nspr, farsight2,
-  libXScrnSaver, ncurses, avahi, dbus, dbus_glib, intltool, libidn
-  , lib, python
-  , openssl ? null
-  , gnutls ? null
-  , libgcrypt ? null
-} :
 
 # FIXME: clean the mess around choosing the SSL library (nss by default)
 
 stdenv.mkDerivation rec {
-  majorVersion = "2";
+  name = "pidgin-${version}";
-  name = "pidgin-${majorVersion}.10.10";
+  version = "2.10.10";
+
   src = fetchurl {
     url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
     sha256 = "0bc2bk2g3w90mpz9sn9j95c71z4i2i3wxaqa2zpmmixf5r8rasyw";
   };
 
   inherit nss ncurses;
+
   buildInputs = [
     gtkspell aspell
     gstreamer gst_plugins_base startupnotification
-    libxml2] 
+    libxml2 nss nspr farsight2
-  ++ (lib.optional (openssl != null) openssl)
-  ++ (lib.optional (gnutls != null) gnutls)
-  ++ (lib.optional (libgcrypt != null) libgcrypt)
-  ++
-  [nss nspr farsight2
     libXScrnSaver ncurses python
     avahi dbus dbus_glib intltool libidn
+    libICE libXext libSM
   ]
-  ;
+  ++ (lib.optional (openssl != null) openssl)
+  ++ (lib.optional (gnutls != null) gnutls)
+  ++ (lib.optional (libgcrypt != null) libgcrypt);
 
   propagatedBuildInputs = [
     pkgconfig gtk perl perlXMLParser gettext
@@ -51,9 +39,18 @@ stdenv.mkDerivation rec {
 
   patches = [./pidgin-makefile.patch ./add-search-path.patch ];
 
-  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 = [
-  + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no")
+    "--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.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]);
+
   meta = with stdenv.lib; {
     description = "Multi-protocol instant messaging client";
     homepage = http://pidgin.im;

pkgs/top-level/all-packages.nix

@@ -10197,6 +10197,7 @@ let
     gnutls = if config.pidgin.gnutls or false then gnutls else null;
     libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
     startupnotification = libstartup_notification;
+    inherit (xlibs) libXext libICE libSM;
   };
 
   pidgin-with-plugins = callPackage ../applications/networking/instant-messengers/pidgin/wrapper.nix {