diff options
-rw-r--r-- | pkgs/development/libraries/libtoxcore/default.nix | 41 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/new-api.nix (renamed from pkgs/development/libraries/libtoxcore/new-api/default.nix) | 2 | ||||
-rw-r--r-- | pkgs/development/libraries/libtoxcore/old-api.nix (renamed from pkgs/development/libraries/libtoxcore/old-api/default.nix) | 6 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 |
4 files changed, 49 insertions, 6 deletions
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix new file mode 100644 index 000000000000..3a00408c7ca3 --- /dev/null +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack +, libvpx, check, libconfig, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libtoxcore-${version}"; + version = "0.1.6"; + + src = fetchFromGitHub { + owner = "TokTok"; + repo = "c-toxcore"; + rev = "v${version}"; + sha256 = "0a00gjar6ibaqa2cm81867nk7chsd141v360268v7ym2mxwa0ya6"; + }; + + cmakeFlags = [ + "-DBUILD_NTOX=ON" + "-DDHT_BOOTSTRAP=ON" + "-DBOOTSTRAP_DAEMON=ON" + ]; + + buildInputs = [ + libsodium libmsgpack ncurses + ] ++ stdenv.lib.optionals (!stdenv.isArm) [ + libopus + libvpx + ]; + nativeBuildInputs = [ cmake pkgconfig ]; + checkInputs = [ check ]; + + checkPhase = "ctest"; + + # for some reason the tests are not running - it says "No tests found!!" + doCheck = true; + + meta = with stdenv.lib; { + description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ peterhoeg ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/new-api/default.nix b/pkgs/development/libraries/libtoxcore/new-api.nix index b88f4f6a74e1..8d0a467c82a8 100644 --- a/pkgs/development/libraries/libtoxcore/new-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/new-api.nix @@ -2,7 +2,7 @@ , libvpx, check, libconfig, pkgconfig }: stdenv.mkDerivation rec { - name = "tox-core-dev-20160727"; + name = "tox-core-new-20160727"; src = fetchFromGitHub { owner = "irungentoo"; diff --git a/pkgs/development/libraries/libtoxcore/old-api/default.nix b/pkgs/development/libraries/libtoxcore/old-api.nix index 2fb5e93eab95..5757e94559a8 100644 --- a/pkgs/development/libraries/libtoxcore/old-api/default.nix +++ b/pkgs/development/libraries/libtoxcore/old-api.nix @@ -4,9 +4,9 @@ let version = "4c220e336330213b151a0c20307d0a1fce04ac9e"; date = "20150126"; -in -stdenv.mkDerivation rec { - name = "tox-core-${date}-${builtins.substring 0 7 version}"; + +in stdenv.mkDerivation rec { + name = "tox-core-old-${date}-${builtins.substring 0 7 version}"; src = fetchFromGitHub { owner = "irungentoo"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 855de099cbac..b95dca132e2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8581,9 +8581,11 @@ with pkgs; libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; - libtoxcore = callPackage ../development/libraries/libtoxcore/old-api { }; + libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { }; - libtoxcore-dev = callPackage ../development/libraries/libtoxcore/new-api { }; + libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; + + libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtap = callPackage ../development/libraries/libtap { }; |