From 8cef304ede7f8d9d3647dcb885e05df9d097469c Mon Sep 17 00:00:00 2001
From: Peter Hoeg <peter@speartail.com>
Date: Tue, 14 Feb 2017 14:57:48 +0800
Subject: [PATCH] libtoxcore: init at 0.1.6 and move old versions away

---
 .../libraries/libtoxcore/default.nix          | 41 +++++++++++++++++++
 .../{new-api/default.nix => new-api.nix}      |  2 +-
 .../{old-api/default.nix => old-api.nix}      |  6 +--
 pkgs/top-level/all-packages.nix               |  6 ++-
 4 files changed, 49 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/libraries/libtoxcore/default.nix
 rename pkgs/development/libraries/libtoxcore/{new-api/default.nix => new-api.nix} (98%)
 rename pkgs/development/libraries/libtoxcore/{old-api/default.nix => old-api.nix} (94%)

diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
new file mode 100644
index 00000000000..3a00408c7ca
--- /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
similarity index 98%
rename from pkgs/development/libraries/libtoxcore/new-api/default.nix
rename to pkgs/development/libraries/libtoxcore/new-api.nix
index b88f4f6a74e..8d0a467c82a 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
similarity index 94%
rename from pkgs/development/libraries/libtoxcore/old-api/default.nix
rename to pkgs/development/libraries/libtoxcore/old-api.nix
index 2fb5e93eab9..5757e94559a 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 855de099cba..b95dca132e2 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 { };