freetalk: 4.1 -> 4.2

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/";
   };
 }

pkgs/top-level/all-packages.nix

@@ -8113,9 +8113,7 @@ with pkgs;
 
   freeipmi = callPackage ../tools/system/freeipmi { };
 
-  freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
-    guile = guile_2_0;
-  };
+  freetalk = callPackage ../applications/networking/instant-messengers/freetalk { };
 
   freetds = callPackage ../development/libraries/freetds { };