diff options
| author | SLNOS <anonymous@wired> | 2017-12-01 00:00:00 +0000 |
|---|---|---|
| committer | Orivej Desh <orivej@gmx.fr> | 2017-12-17 14:33:45 +0000 |
| commit | 205d7f6297d8d10eb4364361d6a0d1104245926e (patch) | |
| tree | 264b5992f632f458c2269244298d3ffcf381264c /pkgs/applications/networking/instant-messengers/ratox | |
| parent | 8bcd948072f7cb07d14516813e74a5256e4b9408 (diff) | |
ratox: 0.2.1 -> 0.4
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/ratox')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ratox/default.nix | 34 | ||||
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch | 5 |
2 files changed, 25 insertions, 14 deletions
diff --git a/pkgs/applications/networking/instant-messengers/ratox/default.nix b/pkgs/applications/networking/instant-messengers/ratox/default.nix index 053e8a9c97399..5d004db60e3ad 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; +let + configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf); +in + stdenv.mkDerivation rec { - name = "ratox-0.2.1"; + name = "ratox-0.4"; - src = fetchurl { - url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; - sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19"; + 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 0000000000000..1406e71431070 --- /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 |