From 522d059dc92400b61e9947c30ee272e59034ec03 Mon Sep 17 00:00:00 2001
From: Andrey Arapov <arno@nixaid.com>
Date: Sat, 31 Jan 2015 03:20:12 +0100
Subject: [PATCH] libtoxcore, utox, qtox, toxic: Update to the newest Dev
 version

---
 .../instant-messengers/qtox/default.nix       | 28 +++++++++++++++----
 .../instant-messengers/toxic/default.nix      |  6 ++--
 .../instant-messengers/utox/default.nix       | 26 +++++++++++++----
 .../libraries/libtoxcore/default.nix          |  6 ++--
 4 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix
index 7f5757e68b44..97ea7719af93 100644
--- a/pkgs/applications/networking/instant-messengers/qtox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix
@@ -1,18 +1,34 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, qt5, openalSoft, opencv
-, libsodium }:
+, libsodium, libXScrnSaver }:
 
+let
 
-stdenv.mkDerivation rec {
-  name = "qtox-dev-20141201";
+  filteraudio = stdenv.mkDerivation rec {
+    name = "filter_audio-20150128";
+
+    src = fetchFromGitHub {
+      owner = "irungentoo";
+      repo = "filter_audio";
+      rev = "76428a6cda";
+      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+    };
+
+    doCheck = false;
+
+    makeFlags = "PREFIX=$(out)";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "qtox-dev-20150130";
 
   src = fetchFromGitHub {
     owner = "tux3";
     repo = "qTox";
-    rev = "qtox-windows-1417469442.11";
-    sha256 = "02nxj0w5qbgc79n8mgyqldk1yadf4p8pysn79f7fvi8fxq4j0j5n";
+    rev = "7574569b3d";
+    sha256 = "0a7zkhl4w2r5ifzs7vwws2lpplp6q5c4jllyf4ld64njgiz6jzip";
   };
 
-  buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium ];
+  buildInputs = [ pkgconfig libtoxcore qt5 openalSoft opencv libsodium filteraudio libXScrnSaver ];
 
   configurePhase = "qmake";
 
diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix
index 5af31cdb21a9..f733acf4133a 100644
--- a/pkgs/applications/networking/instant-messengers/toxic/default.nix
+++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix
@@ -2,13 +2,13 @@
 , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }:
 
 stdenv.mkDerivation rec {
-  name = "toxic-dev-20141130";
+  name = "toxic-dev-20150125";
 
   src = fetchFromGitHub {
     owner = "Tox";
     repo = "toxic";
-    rev = "4acfe84171";
-    sha256 = "1yqglh9fm75zph4fzf3z4gwmamngypwpvb7shpqgakdg8ybq0a8s";
+    rev = "4badc983ea";
+    sha256 = "01zk6316v51f1zvp5ss53ay49h3nnaq5snlk0gxmsrmwg71bsnm6";
   };
 
   makeFlags = [ "-Cbuild" "PREFIX=$(out)" ];
diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix
index 1c6183ed330a..17a7f11cccea 100644
--- a/pkgs/applications/networking/instant-messengers/utox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/utox/default.nix
@@ -1,19 +1,35 @@
 { stdenv, fetchFromGitHub, pkgconfig, libtoxcore, dbus, libvpx, libX11, openal, freetype, libv4l
 , libXrender, fontconfig, libXext, libXft }:
 
+let
 
-stdenv.mkDerivation rec {
-  name = "utox-dev-20141130";
+  filteraudio = stdenv.mkDerivation rec {
+    name = "filter_audio-20150128";
+
+    src = fetchFromGitHub {
+      owner = "irungentoo";
+      repo = "filter_audio";
+      rev = "76428a6cda";
+      sha256 = "0c4wp9a7dzbj9ykfkbsxrkkyy0nz7vyr5map3z7q8bmv9pjylbk9";
+    };
+
+    doCheck = false;
+
+    makeFlags = "PREFIX=$(out)";
+  };
+
+in stdenv.mkDerivation rec {
+  name = "utox-dev-20150130";
 
   src = fetchFromGitHub {
     owner = "notsecure";
     repo = "uTox";
-    rev = "38b0a2014f";
-    sha256 = "00g9fsp83yjq6dfim3hfpag0ny9w5kydghycfj3ic8qaljp47y8a";
+    rev = "cb7b8d09b08";
+    sha256 = "0vg9h07ipwyf7p54p43z9bcymy0skiyjbm7zvyjg7r5cvqxv1vpa";
   };
 
   buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype
-                  libv4l libXrender fontconfig libXext libXft ];
+                  libv4l libXrender fontconfig libXext libXft filteraudio ];
 
   doCheck = false;
   
diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix
index de224f6b613b..3ff2e1ad285d 100644
--- a/pkgs/development/libraries/libtoxcore/default.nix
+++ b/pkgs/development/libraries/libtoxcore/default.nix
@@ -2,8 +2,8 @@
 , libvpx, check, libconfig, pkgconfig }:
 
 let
-  version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a";
-  date = "20141219";
+  version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
+  date = "20150126";
 in
 stdenv.mkDerivation rec {
   name = "tox-core-${date}-${builtins.substring 0 7 version}";
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
     owner  = "irungentoo";
     repo   = "toxcore";
     rev    = version;
-    sha256 = "1wd817kix3zjyzzb68jz02iir3z4y5k5p40dgl7a29757yb9m608";
+    sha256 = "152yamak9ykl8dgkx1qzyrpa3f4xr1s8lgcb5k58r9lb1iwnhvqc";
   };
 
   NIX_LDFLAGS = "-lgcc_s";