diff options
author | Rickard Nilsson <rickynils@gmail.com> | 2014-10-30 10:10:27 +0100 |
---|---|---|
committer | Rickard Nilsson <rickynils@gmail.com> | 2014-10-30 10:10:48 +0100 |
commit | eaf513da6a0318e6ed03a94e3205ddac66d35a76 (patch) | |
tree | e0990a06f177917a8aa3423535fee626dee9b6d9 /pkgs/applications/networking/instant-messengers/pidgin | |
parent | 90d6146d12f00ef71d7b0531edf6f36e037ac534 (diff) |
pidgin: Fix compilation errors, clean up
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/pidgin')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 63 |
1 files changed, 30 insertions, 33 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index d5061e6f4314..32004496534f 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -1,49 +1,37 @@ -/** - * Possible missing configuration: - * - * - silcclient - * - libebook-1.2 - * - libedata-book-1.2 - * - checking for XScreenSaverRegister in -lXext... no - * - checking for XScreenSaverRegister in -lXss... no - * - 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 -} : +{ 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, libICE, libXext, libSM +, 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-${majorVersion}.10.10"; + name = "pidgin-${version}"; + 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] - ++ (lib.optional (openssl != null) openssl) - ++ (lib.optional (gnutls != null) gnutls) - ++ (lib.optional (libgcrypt != null) libgcrypt) - ++ - [nss nspr farsight2 + libxml2 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" - + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") - ; + 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.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; |