1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-19 20:21:14 +00:00

pidgin: 2.13.0 -> 2.14.6

This commit is contained in:
Mykola Orliuk 2021-07-11 19:51:25 +02:00
parent 30ada3e6af
commit 2df085d5c0

View file

@ -3,7 +3,7 @@
, gst_all_1, startupnotification, gettext , gst_all_1, startupnotification, gettext
, perlPackages, libxml2, nss, nspr, farstream , perlPackages, libxml2, nss, nspr, farstream
, libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn , libXScrnSaver, ncurses, avahi, dbus, dbus-glib, intltool, libidn
, lib, python, libICE, libXext, libSM , lib, python3, libICE, libXext, libSM
, cyrus_sasl ? null , cyrus_sasl ? null
, openssl ? null , openssl ? null
, gnutls ? null , gnutls ? null
@ -16,11 +16,11 @@
let unwrapped = stdenv.mkDerivation rec { let unwrapped = stdenv.mkDerivation rec {
pname = "pidgin"; pname = "pidgin";
majorVersion = "2"; majorVersion = "2";
version = "${majorVersion}.13.0"; version = "${majorVersion}.14.6";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2"; url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.bz2";
sha256 = "13vdqj70315p9rzgnbxjp9c51mdzf1l4jg1kvnylc4bidw61air7"; sha256 = "bb45f7c032f9efd6922a5dbf2840995775e5584771b23992d04f6eff7dff5336";
}; };
inherit nss ncurses; inherit nss ncurses;
@ -30,7 +30,7 @@ let unwrapped = stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0"; NIX_CFLAGS_COMPILE = "-I${gst_all_1.gst-plugins-base.dev}/include/gstreamer-1.0";
buildInputs = let buildInputs = let
python-with-dbus = python.withPackages (pp: with pp; [ dbus-python ]); python-with-dbus = python3.withPackages (pp: with pp; [ dbus-python ]);
in [ in [
aspell startupnotification aspell startupnotification
gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good
@ -62,6 +62,7 @@ let unwrapped = stdenv.mkDerivation rec {
"--disable-meanwhile" "--disable-meanwhile"
"--disable-nm" "--disable-nm"
"--disable-tcl" "--disable-tcl"
"--disable-gevolution"
] ]
++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ]) ++ (lib.optionals (cyrus_sasl != null) [ "--enable-cyrus-sasl=yes" ])
++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]) ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"])