ratox: 0.2.1 -> 0.4

This commit is contained in:
SLNOS 2017-12-01 00:00:00 +00:00 committed by Orivej Desh
parent 8bcd948072
commit 205d7f6297
3 changed files with 27 additions and 18 deletions

View File

@ -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;
};
}

View File

@ -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

View File

@ -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 { };