diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api/default.nix new file mode 100644 index 00000000000..42f81cf6a9d --- /dev/null +++ b/pkgs/development/libraries/libtoxcore/new-api/default.nix @@ -0,0 +1,60 @@ +{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus +, libvpx, check, libconfig, pkgconfig }: + +stdenv.mkDerivation rec { + name = "tox-core-dev-20150629"; + + src = fetchFromGitHub { + owner = "irungentoo"; + repo = "toxcore"; + rev = "219fabc0f5dbaac7968cb7728d25dface3ebb2ea"; + sha256 = "1rsnxa5b7i2zclx0kzbf4a5mds0jfkvfjz1s4whzk7rf8w3vpqkh"; + }; + + 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" + "--enable-daemon" + ]; + + buildInputs = [ + autoconf libtool automake libsodium ncurses + check libconfig pkgconfig + ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + libopus + ]; + + propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; + + # Some tests fail randomly due to timeout. This kind of problem is well known + # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} + # They don't recommend running tests on 50core machines with other cpu-bound + # tests running in parallel. + # + # NOTE: run the tests locally on your machine before upgrading this package! + doCheck = false; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ viric jgeerds ]; + platforms = platforms.all; + }; +} + diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/old-api/default.nix similarity index 100% rename from pkgs/development/libraries/libtoxcore/default.nix rename to pkgs/development/libraries/libtoxcore/old-api/default.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0f457aa5cd7..f83d01c055e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7268,7 +7268,9 @@ let else stdenv; }; - libtoxcore = callPackage ../development/libraries/libtoxcore { }; + libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; + + libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { }; libtsm = callPackage ../development/libraries/libtsm { automake = automake114x;