JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

libtoxcore: introduce 0.2.2 in addition to 0.1.11

Browse Source
This commit is contained in:
Peter Hoeg 2018-04-19 18:19:23 +08:00
parent 1b1b76f70a
commit 15268306fe
2 changed files with 46 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
pkgs/development/libraries/libtoxcore/default.nix
View File

@ -1,46 +1,51 @@
{ stdenv, fetchFromGitHub, cmake, libsodium, ncurses, libopus, libmsgpack
, libvpx, check, libconfig, pkgconfig }:
stdenv.mkDerivation rec {
name = "libtoxcore-${version}";
version = "0.1.11";
let
generic = { version, sha256 }:
stdenv.mkDerivation rec {
name = "libtoxcore-${version}";
src = fetchFromGitHub {
owner = "TokTok";
repo = "c-toxcore";
rev = "v${version}";
src = fetchFromGitHub {
owner = "TokTok";
repo = "c-toxcore";
rev = "v${version}";
inherit sha256;
};
cmakeFlags = [
"-DBUILD_NTOX=ON"
"-DDHT_BOOTSTRAP=ON"
"-DBOOTSTRAP_DAEMON=ON"
];
buildInputs = [
libsodium libmsgpack ncurses libconfig
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
libopus libvpx
];
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype";
homepage = https://tox.chat;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
};
};
in rec {
libtoxcore_0_1 = generic {
version = "0.1.11";
sha256 = "1fya5gfiwlpk6fxhalv95n945ymvp2iidiyksrjw1xw95fzsp1ij";
};
cmakeFlags = [
"-DBUILD_NTOX=ON"
"-DDHT_BOOTSTRAP=ON"
"-DBOOTSTRAP_DAEMON=ON"
];
buildInputs = [
libsodium libmsgpack ncurses libconfig
] ++ stdenv.lib.optionals (!stdenv.isAarch32) [
libopus
libvpx
];
nativeBuildInputs = [ cmake pkgconfig ];
enableParallelBuilding = true;
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";
homepage = https://tox.chat;
license = licenses.gpl3Plus;
maintainers = with maintainers; [ peterhoeg ];
platforms = platforms.all;
libtoxcore_0_2 = generic {
version = "0.2.2";
sha256 = "1463grbbv009pj2g6dbnyk4lr871vw41962m63v21mmp6dkrr7r5";
};
}

5
pkgs/top-level/all-packages.nix
View File

@ -10358,9 +10358,12 @@ with pkgs;
libtorrentRasterbar = callPackage ../development/libraries/libtorrent-rasterbar { };
# this is still the new version of the old API
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
libtoxcore = callPackage ../development/libraries/libtoxcore { };
inherit (callPackages ../development/libraries/libtoxcore {})
libtoxcore_0_1 libtoxcore_0_2;
libtoxcore = libtoxcore_0_2;
libtap = callPackage ../development/libraries/libtap { };