From 205d7f6297d8d10eb4364361d6a0d1104245926e Mon Sep 17 00:00:00 2001
From: SLNOS <anonymous@wired>
Date: Fri, 1 Dec 2017 00:00:00 +0000
Subject: [PATCH] ratox: 0.2.1 -> 0.4

---
 .../instant-messengers/ratox/default.nix      | 36 +++++++++++--------
 .../instant-messengers/ratox/ldlibs.patch     |  5 +++
 pkgs/top-level/all-packages.nix               |  4 +--
 3 files changed, 27 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch

diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix
index 053e8a9c973..5d004db60e3 100644
--- a/pkgs/applications/networking/instant-messengers/ratox/default.nix
+++ b/pkgs/applications/networking/instant-messengers/ratox/default.nix
@@ -1,28 +1,34 @@
-{ stdenv, fetchurl, libtoxcore
+{ stdenv, fetchgit, libtoxcore
 , conf ? null }:
 
 with stdenv.lib;
 
-stdenv.mkDerivation rec {
-  name = "ratox-0.2.1";
+let
+  configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
+in
 
-  src = fetchurl {
-    url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz";
-    sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19";
+stdenv.mkDerivation rec {
+  name = "ratox-0.4";
+
+  src = fetchgit {
+    url = "git://git.2f30.org/ratox.git";
+    rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c";
+    sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5";
   };
 
+  patches = [ ./ldlibs.patch ];
+
   buildInputs = [ libtoxcore ];
 
-  configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
   preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h";
 
-  preBuild = "makeFlags=PREFIX=$out";
+  makeFlags = [ "PREFIX=$(out)" ];
 
-  meta =
-    { description = "FIFO based tox client";
-      homepage = http://ratox.2f30.org/;
-      license = licenses.isc;
-      maintainers = with maintainers; [ ehmry ];
-      platforms = platforms.linux;
-    };
+  meta = {
+    description = "FIFO based tox client";
+    homepage = http://ratox.2f30.org/;
+    license = licenses.isc;
+    maintainers = with maintainers; [ ehmry ];
+    platforms = platforms.linux;
+  };
 }
diff --git a/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
new file mode 100644
index 00000000000..1406e714310
--- /dev/null
+++ b/pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch
@@ -0,0 +1,5 @@
+--- a/config.mk
++++ b/config.mk
+@@ -13 +13 @@ LDFLAGS  = -L/usr/local/lib
+-LDLIBS   = -ltoxcore -ltoxav -ltoxencryptsave -lsodium -lopus -lvpx -lm -lpthread
++LDLIBS   = -ltoxcore -ltoxav -ltoxencryptsave -lm -lpthread
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10b8d72bb16..76e41d6dc2b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -16541,9 +16541,7 @@ with pkgs;
 
   ratmen = callPackage ../tools/X11/ratmen {};
 
-  ratox = callPackage ../applications/networking/instant-messengers/ratox {
-    libtoxcore = libtoxcore-old;
-  };
+  ratox = callPackage ../applications/networking/instant-messengers/ratox { };
 
   ratpoison = callPackage ../applications/window-managers/ratpoison { };