diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-08-05 00:02:07 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-08-05 00:02:07 +0000 |
commit | 16547be5c0839449a750a05668778e15d15694a9 (patch) | |
tree | e56e3a2b78e4066a9919deb6fed750d260c2005f /pkgs/applications/networking/instant-messengers | |
parent | 3af9469ebd9f79d0adbdf77d11f18e2a58a2b1ea (diff) | |
parent | 5767e7b931f2e6ee7f582d564b8665095c059f3b (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/networking/instant-messengers')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/freetalk/default.nix | 36 |
1 files changed, 12 insertions, 24 deletions
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index ffe82e6708aad..fdfbbc5b275b3 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,43 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch +{ lib, stdenv, fetchurl , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo -, automake, autoconf }: +, argp-standalone }: stdenv.mkDerivation rec { pname = "freetalk"; - version = "4.1"; + version = "4.2"; - src = fetchFromGitHub { - owner = "GNUFreetalk"; - repo = "freetalk"; - rev = "v${version}"; - sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; + src = fetchurl { + url = "mirror://gnu/freetalk/freetalk-${version}.tar.gz"; + hash = "sha256-u1tPKacGry+JGYeAIgDia3N7zs5EM4FyQZdV8e7htYA="; }; - patches = [ - # Pull pending patch for -fno-common tuulchain support: - # https://github.com/GNUFreetalk/freetalk/pull/39 - (fetchpatch { - name = "fno-common.patch"; - url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; - sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; - }) - ]; - - preConfigure = '' - ./autogen.sh - ''; - - nativeBuildInputs = [ pkg-config texinfo autoconf automake ]; + nativeBuildInputs = [ pkg-config texinfo ]; buildInputs = [ guile glib loudmouth gmp libidn readline libtool libunwind ncurses curl jansson + ] ++ lib.optionals stdenv.isDarwin [ + argp-standalone ]; + env.NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-largp"; + meta = with lib; { description = "Console XMPP client"; license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; - platforms = platforms.linux; + platforms = platforms.unix; downloadPage = "https://www.gnu.org/software/freetalk/"; }; } |