Moving the attribute tox_core to libtoxcore. It seems more appropiate.

2 files changed, 6 insertions, 42 deletions

diff --git a/pkgs/applications/networking/instant-messengers/toxcore/default.nix b/pkgs/applications/networking/instant-messengers/toxcore/default.nix
deleted file mode 100644
index 0098ddb9d77a..000000000000
--- a/pkgs/applications/networking/instant-messengers/toxcore/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
-, libconfig, pkgconfig }:
-
-let
-  version = "31f5d7a8ab";
-  date = "20131011";
-in
-stdenv.mkDerivation rec {
-  name = "tox-core-${date}-${version}";
-
-  src = fetchurl {
-    url = "https://github.com/irungentoo/ProjectTox-Core/tarball/${version}";
-    name = "${name}.tar.gz";
-    sha256 = "0frz8ylvi33i7zkiz3hp28ylqg4c3ffrbc2m3ibb4zv9rwfzf77r";
-  };
-
-  preConfigure = ''
-    autoreconf -i
-  '';
-
-  configureFlags = [ "--with-libsodium-headers=${libsodium}/include"
-    "--with-libsodium-libs=${libsodium}/lib" 
-    "--enable-ntox" ];
-
-  buildInputs = [ autoconf libtool automake libsodium ncurses libconfig
-    pkgconfig ];
-
-  doCheck = true;
-
-  meta = {
-    description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
-    license = "GPLv3+";
-    maintainers = with stdenv.lib.maintainers; [ viric ];
-    platforms = stdenv.lib.platforms.all;
-  };
-}
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index a87bcc651d6f..c2af1274a24c 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses
-, tox_core, pkgconfig }:
+, libtoxcore, pkgconfig }:
 
 let
   version = "75d356e52a";
@@ -21,13 +21,13 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lsodium";
 
   configureFlags = [
-    "--with-libtoxcore-headers=${tox_core}/include"
-    "--with-libtoxcore-libs=${tox_core}/lib" 
-    "--with-libsodium-headers=${tox_core}/include"
-    "--with-libsodium-libs=${tox_core}/lib" 
+    "--with-libtoxcore-headers=${libtoxcore}/include"
+    "--with-libtoxcore-libs=${libtoxcore}/lib" 
+    "--with-libsodium-headers=${libtoxcore}/include"
+    "--with-libsodium-libs=${libtoxcore}/lib" 
   ];
 
-  buildInputs = [ autoconf libtool automake tox_core libsodium ncurses pkgconfig ];
+  buildInputs = [ autoconf libtool automake libtoxcore libsodium ncurses pkgconfig ];
 
   doCheck = true;