diff options
author | Michael Raskin <7c6f434c@mail.ru> | 2014-10-07 09:55:50 +0400 |
---|---|---|
committer | Michael Raskin <7c6f434c@mail.ru> | 2014-10-07 16:23:28 +0400 |
commit | c16cce32049439e15221835214ca576a987f0ecf (patch) | |
tree | e1271968f02e5c518e6ad54618b006649d74d824 /pkgs/applications/networking/instant-messengers/freetalk | |
parent | f67e66cf4cf5132282882bdcf5dbe0812dce028f (diff) | |
download | nixlib-c16cce32049439e15221835214ca576a987f0ecf.tar nixlib-c16cce32049439e15221835214ca576a987f0ecf.tar.gz nixlib-c16cce32049439e15221835214ca576a987f0ecf.tar.bz2 nixlib-c16cce32049439e15221835214ca576a987f0ecf.tar.lz nixlib-c16cce32049439e15221835214ca576a987f0ecf.tar.xz nixlib-c16cce32049439e15221835214ca576a987f0ecf.tar.zst nixlib-c16cce32049439e15221835214ca576a987f0ecf.zip |
Update freetalk
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/freetalk')
-rw-r--r-- | pkgs/applications/networking/instant-messengers/freetalk/default.nix | 74 |
1 files changed, 33 insertions, 41 deletions
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index cdbc4233cf48..320e7094d484 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,51 +1,43 @@ -x@{builderDefsPackage - , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool - , libunwind, ncurses - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchgit +, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool +, libunwind, ncurses, curl, jansson, texinfo +, automake, autoconf +}: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { +let + s = rec { baseName="freetalk"; - version="3.2"; + version="4.0rc6"; name="${baseName}-${version}"; - url="mirror://savannah/${baseName}/${name}.tar.gz"; - hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; + url="https://github.com/GNUFreetalk/freetalk"; + rev = "refs/tags/v${version}"; + sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz"; }; + buildInputs = [ + guile pkgconfig glib loudmouth gmp libidn readline libtool + libunwind ncurses curl jansson texinfo + autoconf automake + ]; in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; +stdenv.mkDerivation { + inherit (s) name version; inherit buildInputs; + src = fetchgit { + inherit (s) url rev sha256; + name = "git-export-${s.name}"; + }; - patches = [./01_callbacks_const_fix.diff]; + preConfigure = '' + patchShebangs . + ./autogen.sh + ''; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - meta = { - description = "Console XMPP client"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl3Plus; + inherit (s) version; + description = "Console XMPP client"; + license = stdenv.lib.licenses.gpl3Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.gnu.org/software/freetalk/"; }; - passthru = { - updateInfo = { - downloadPage = "http://www.gnu.org/software/freetalk/"; - }; - }; -}) x - +} |