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

pidgin: minor update 2.10.7 -> .8, including CVE-2013-6484

Browse Source 
Also switch no newer libstartup-notification, add license and platforms.
This commit is contained in:
Vladimír Čunát 2014-02-01 08:43:33 +01:00
parent 6d449f7c60
commit 5d2e884aa1
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,10 +21,10 @@
} :
stdenv.mkDerivation rec {
name = "pidgin-2.10.7";
name = "pidgin-2.10.8";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${name}.tar.bz2";
sha256 = "14piyx4xpc3l8286x4nh5pna2wfyn9cv0qa29br1q3d2xja2k8zb";
sha256 = "09w2gbnplyw21lmf9jwk6vkk5gpx5lq15s38bmhkxzw86mz3ccxn";
};
inherit nss ncurses;
@ -51,8 +51,10 @@ stdenv.mkDerivation rec {
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 = {
meta = with stdenv.lib; {
description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client";
homepage = http://pidgin.im;
license = licenses.gpl2Plus;
platforms = platforms.linux;
};
}

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

@ -8555,7 +8555,7 @@ let
openssl = if config.pidgin.openssl or true then openssl else null;
gnutls = if config.pidgin.gnutls or false then gnutls else null;
libgcrypt = if config.pidgin.gnutls or false then libgcrypt else null;
inherit (gnome) startupnotification;
startupnotification = libstartup_notification;
};
pidginlatex = callPackage ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex {