diff options
| author | Maximilian Bosch <maximilian@mbosch.me> | 2021-07-16 21:29:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-16 21:29:57 +0200 |
| commit | e92f6aa350ee710a17b5673ecaca9edd8f388052 (patch) | |
| tree | 5aa27a219098df11ce80b5d2ea927cf5dc175e69 /pkgs/applications/networking | |
| parent | 841a62ab063a0f64ac6f0e1312fa1cf57a16e016 (diff) | |
| parent | 7997c258db3f904c368890b0a40119cf7699a990 (diff) | |
| download | nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.tar nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.tar.gz nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.tar.bz2 nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.tar.lz nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.tar.xz nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.tar.zst nixpkgs-e92f6aa350ee710a17b5673ecaca9edd8f388052.zip | |
Merge pull request #129962 from ony/bump/pidgin
pidgin: 2.13.0 -> 2.14.6
Diffstat (limited to 'pkgs/applications/networking')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/pidgin/default.nix | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index dc5a8739760..b5bdef03db7 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -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"]) |