diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 9af8718dc5f..42d2fe11f7b 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -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"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cac46ff0f4c..fea7f1e3441 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };