Merge pull request #129962 from ony/bump/pidgin

pidgin: 2.13.0 -> 2.14.6
This commit is contained in:
Maximilian Bosch 2021-07-16 21:29:57 +02:00 committed by GitHub
commit e92f6aa350
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 54 additions and 8 deletions

View file

@ -7888,6 +7888,12 @@
githubId = 757752;
name = "Jonas Heinrich";
};
ony = {
name = "Mykola Orliuk";
email = "virkony@gmail.com";
github = "ony";
githubId = 11265;
};
OPNA2608 = {
email = "christoph.neidahl@gmail.com";
github = "OPNA2608";

View file

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

View file

@ -0,0 +1,37 @@
{ stdenv, lib, fetchurl, meson, ninja, pkg-config
, gtk-doc, docbook-xsl-nons
, glib, ncurses, libxml2
, buildDocs ? true
}:
stdenv.mkDerivation rec {
pname = "libgnt";
version = "2.14.1";
outputs = [ "out" "dev" ] ++ lib.optional buildDocs "devdoc";
src = fetchurl {
url = "mirror://sourceforge/pidgin/${pname}-${version}.tar.xz";
sha256 = "1n2bxg0ignn53c08cp69pj4sdg53kwlqn23rincyjmpr327fdhsy";
};
nativeBuildInputs = [ meson ninja pkg-config ]
++ lib.optionals buildDocs [ gtk-doc docbook-xsl-nons ];
buildInputs = [ glib ncurses libxml2 ];
postPatch = ''
substituteInPlace meson.build --replace \
"ncurses_sys_prefix = '/usr'" \
"ncurses_sys_prefix = '${lib.getDev ncurses}'"
'' + lib.optionalString (!buildDocs) ''
sed "/^subdir('doc')$/d" -i meson.build
'';
meta = with lib; {
description = "An ncurses toolkit for creating text-mode graphical user interfaces";
homepage = "https://keep.imfreedom.org/libgnt/libgnt/";
license = licenses.gpl2Plus;
platforms = platforms.unix;
maintainers = with lib.maintainers; [ ony ];
};
}

View file

@ -16540,6 +16540,8 @@ in
libgksu = callPackage ../development/libraries/libgksu { };
libgnt = callPackage ../development/libraries/libgnt { };
libgpgerror = callPackage ../development/libraries/libgpg-error { };
# https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgpg-error.git;a=blob;f=README;h=fd6e1a83f55696c1f7a08f6dfca08b2d6b7617ec;hb=70058cd9f944d620764e57c838209afae8a58c78#l118