public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #32417 from oxij/pkg/ratox

Browse Source 
ratox: 0.2.1 -> 0.4
This commit is contained in:
Orivej Desh 2017-12-23 23:07:51 +00:00 committed by GitHub
commit cc8705dcc6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 27 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
pkgs/applications/networking/instant-messengers/ratox/default.nix
View File

@ -1,28 +1,34 @@
{ stdenv, fetchurl, libtoxcore { stdenv, fetchgit, libtoxcore
, conf ? null }: , conf ? null }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { let
name = "ratox-0.2.1"; configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
in
src = fetchurl { stdenv.mkDerivation rec {
url = "http://git.2f30.org/ratox/snapshot/${name}.tar.gz"; name = "ratox-0.4";
sha256 = "0xnw3zcz9frmcxqhwg38hhnsy1g5xl9yc19nl0vwi5awz8wqqy19";
src = fetchgit {
url = "git://git.2f30.org/ratox.git";
rev = "0db821b7bd566f6cfdc0cc5a7bbcc3e5e92adb4c";
sha256 = "0wmf8hydbcq4bkpsld9vnqw4zfzf3f04vhgwy17nd4p5p389fbl5";
}; };
patches = [ ./ldlibs.patch ];
buildInputs = [ libtoxcore ]; buildInputs = [ libtoxcore ];
configFile = optionalString (conf!=null) (builtins.toFile "config.h" conf);
preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h"; preConfigure = optionalString (conf!=null) "cp ${configFile} config.def.h";
preBuild = "makeFlags=PREFIX=$out"; makeFlags = [ "PREFIX=$(out)" ];
meta = meta = {
{ description = "FIFO based tox client"; description = "FIFO based tox client";
homepage = http://ratox.2f30.org/; homepage = http://ratox.2f30.org/;
license = licenses.isc; license = licenses.isc;
maintainers = with maintainers; [ ehmry ]; maintainers = with maintainers; [ ehmry ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

5
pkgs/applications/networking/instant-messengers/ratox/ldlibs.patch Normal file
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

59
pkgs/development/libraries/libtoxcore/old-api.nix
View File

@ -1,59 +0,0 @@
{ stdenv, fetchFromGitHub, autoreconfHook, libsodium, ncurses, libopus
, libvpx, check, libconfig, pkgconfig }:
let
version = "4c220e336330213b151a0c20307d0a1fce04ac9e";
date = "20150126";
in stdenv.mkDerivation rec {
name = "tox-core-old-${date}-${builtins.substring 0 7 version}";
src = fetchFromGitHub {
owner = "irungentoo";
repo = "toxcore";
rev = version;
sha256 = "152yamak9ykl8dgkx1qzyrpa3f4xr1s8lgcb5k58r9lb1iwnhvqc";
};
NIX_LDFLAGS = "-lgcc_s";
postPatch = ''
# within Nix chroot builds, localhost is unresolvable
sed -i -e '/DEFTESTCASE(addr_resolv_localhost)/d' \
auto_tests/network_test.c
# takes WAAAY too long (~10 minutes) and would timeout
sed -i -e '/DEFTESTCASE[^(]*(many_clients\>/d' \
auto_tests/tox_test.c
'';
configureFlags = [
"--with-libsodium-headers=${libsodium.dev}/include"
"--with-libsodium-libs=${libsodium.out}/lib"
"--enable-ntox"
"--enable-daemon"
];
buildInputs = [
autoreconfHook libsodium ncurses
check libconfig pkgconfig
] ++ stdenv.lib.optionals (!stdenv.isArm) [
libopus
];
propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ];
# Some tests fail randomly due to timeout. This kind of problem is well known
# by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054}
# They don't recommend running tests on 50core machines with other cpu-bound
# tests running in parallel.
#
# NOTE: run the tests locally on your machine before upgrading this package!
doCheck = false;
meta = with stdenv.lib; {
description = "P2P FOSS instant messaging application aimed to replace Skype with crypto";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ viric jgeerds ];
platforms = platforms.all;
};
}

6
pkgs/top-level/all-packages.nix
View File

@ -9782,8 +9782,6 @@ with pkgs;
libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { }; libtorrentRasterbar_1_0 = callPackage ../development/libraries/libtorrent-rasterbar/1.0.nix { };
libtoxcore-old = callPackage ../development/libraries/libtoxcore/old-api.nix { };
libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { }; libtoxcore-new = callPackage ../development/libraries/libtoxcore/new-api.nix { };
libtoxcore = callPackage ../development/libraries/libtoxcore { }; libtoxcore = callPackage ../development/libraries/libtoxcore { };
@ -16625,9 +16623,7 @@ with pkgs;
ratmen = callPackage ../tools/X11/ratmen {}; ratmen = callPackage ../tools/X11/ratmen {};
ratox = callPackage ../applications/networking/instant-messengers/ratox { ratox = callPackage ../applications/networking/instant-messengers/ratox { };
libtoxcore = libtoxcore-old;
};
ratpoison = callPackage ../applications/window-managers/ratpoison { }; ratpoison = callPackage ../applications/window-managers/ratpoison { };