Update freetalk

This commit is contained in:
Michael Raskin 2014-10-07 09:55:50 +04:00
parent f67e66cf4c
commit c16cce3204
2 changed files with 34 additions and 42 deletions

View File

@ -1,51 +1,43 @@
x@{builderDefsPackage { stdenv, fetchgit
, guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool , guile, pkgconfig, glib, loudmouth, gmp, libidn, readline, libtool
, libunwind, ncurses , libunwind, ncurses, curl, jansson, texinfo
, ...}: , automake, autoconf
builderDefsPackage }:
(a :
let
helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++
[];
buildInputs = map (n: builtins.getAttr n x) let
(builtins.attrNames (builtins.removeAttrs x helperArgNames)); s = rec {
sourceInfo = rec {
baseName="freetalk"; baseName="freetalk";
version="3.2"; version="4.0rc6";
name="${baseName}-${version}"; name="${baseName}-${version}";
url="mirror://savannah/${baseName}/${name}.tar.gz"; url="https://github.com/GNUFreetalk/freetalk";
hash="12dn7yj9k5xsrrjlnma77wzpvsdxjccwla1q0wy3lacl5l2p0jms"; rev = "refs/tags/v${version}";
sha256="0sj3bwq9n6ijwv552nmi038sz7wayq8r3zaj6ngn2cnkn2b5nwbz";
}; };
buildInputs = [
guile pkgconfig glib loudmouth gmp libidn readline libtool
libunwind ncurses curl jansson texinfo
autoconf automake
];
in in
rec { stdenv.mkDerivation {
src = a.fetchurl { inherit (s) name version;
url = sourceInfo.url;
sha256 = sourceInfo.hash;
};
inherit (sourceInfo) name version;
inherit buildInputs; 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 = { meta = {
description = "Console XMPP client"; inherit (s) version;
maintainers = with a.lib.maintainers; description = "Console XMPP client";
[ license = stdenv.lib.licenses.gpl3Plus ;
raskin maintainers = [stdenv.lib.maintainers.raskin];
]; platforms = stdenv.lib.platforms.linux;
platforms = with a.lib.platforms; downloadPage = "http://www.gnu.org/software/freetalk/";
linux;
license = a.lib.licenses.gpl3Plus;
}; };
passthru = { }
updateInfo = {
downloadPage = "http://www.gnu.org/software/freetalk/";
};
};
}) x

View File

@ -1152,7 +1152,7 @@ let
freeipmi = callPackage ../tools/system/freeipmi {}; freeipmi = callPackage ../tools/system/freeipmi {};
freetalk = callPackage ../applications/networking/instant-messengers/freetalk { freetalk = callPackage ../applications/networking/instant-messengers/freetalk {
guile = guile_1_8; automake = automake114x;
}; };
freetds = callPackage ../development/libraries/freetds { }; freetds = callPackage ../development/libraries/freetds { };