toxic: Update to latest upstream Git master.
Unfortunately they've changed their build system to be makefile-only and they don't seem to include test cases in the CLI anymore, so we needed to adapt accordingly. Also added freealut and openal to the buildInputs, in order to allow audio support. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
parent
e542ff7288
commit
9edfad2717
|
@ -1,9 +1,9 @@
|
|||
{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
|
||||
, libtoxcore, pkgconfig }:
|
||||
, libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
|
||||
|
||||
let
|
||||
version = "b308e19e6b";
|
||||
date = "20140224";
|
||||
version = "7566aa9d26";
|
||||
date = "20140728";
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
name = "toxic-${date}-${version}";
|
||||
|
@ -11,26 +11,17 @@ stdenv.mkDerivation rec {
|
|||
src = fetchurl {
|
||||
url = "https://github.com/Tox/toxic/tarball/${version}";
|
||||
name = "${name}.tar.gz";
|
||||
sha256 = "0fgkvnpy3dl2h378h796z9md0zg05b3174fgx17b919av6j9x4ma";
|
||||
sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
autoreconf -i
|
||||
'';
|
||||
makeFlags = [ "-Cbuild" "VERSION=${version}" ];
|
||||
installFlags = [ "PREFIX=$(out)" ];
|
||||
|
||||
NIX_LDFLAGS = "-lsodium";
|
||||
|
||||
configureFlags = [
|
||||
"--with-libtoxcore-headers=${libtoxcore}/include"
|
||||
"--with-libtoxcore-libs=${libtoxcore}/lib"
|
||||
"--with-libsodium-headers=${libtoxcore}/include"
|
||||
"--with-libsodium-libs=${libtoxcore}/lib"
|
||||
buildInputs = [
|
||||
autoconf libtool automake libtoxcore libsodium ncurses openal libvpx
|
||||
freealut libconfig pkgconfig
|
||||
];
|
||||
|
||||
buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ];
|
||||
|
||||
doCheck = true;
|
||||
|
||||
meta = {
|
||||
description = "Reference CLI for Tox";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
|
|
Loading…
Reference in New Issue