diff options
Diffstat (limited to 'pkgs/development/libraries/libtoxcore/default.nix')
-rw-r--r-- | pkgs/development/libraries/libtoxcore/default.nix | 39 |
1 files changed, 27 insertions, 12 deletions
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 0098ddb9d77a..6741838d33b6 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,35 +1,50 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses -, libconfig, pkgconfig }: +{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +, libvpx, check, libconfig, pkgconfig }: let - version = "31f5d7a8ab"; - date = "20131011"; + version = "e1158be5a6"; + date = "20140728"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; src = fetchurl { - url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}"; + url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r"; + sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; }; + NIX_LDFLAGS = "-lgcc_s"; + + postPatch = '' + # within Nix chroot builds, localhost is unresolvable + sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \ + auto_tests/network_test.c + # takes WAAAY too long (~10 minutes) and would timeout + sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \ + auto_tests/tox_test.c + ''; + preConfigure = '' autoreconf -i ''; - configureFlags = [ "--with-libsodium-headers=${libsodium}/include" - "--with-libsodium-libs=${libsodium}/lib" - "--enable-ntox" ]; + configureFlags = [ + "--with-libsodium-headers=${libsodium}/include" + "--with-libsodium-libs=${libsodium}/lib" + "--enable-ntox" + ]; - buildInputs = [ autoconf libtool automake libsodium ncurses libconfig - pkgconfig ]; + buildInputs = [ + autoconf libtool automake libsodium ncurses libopus + libvpx check libconfig pkgconfig + ]; doCheck = true; meta = { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; - license = "GPLv3+"; + license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ viric ]; platforms = stdenv.lib.platforms.all; }; |