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

toxvpn: 20160909 -> 20161230

Browse Source
This commit is contained in:
Peter Hoeg 2017-02-14 14:59:59 +08:00
parent a66e04d3be
commit 7690ec0022
1 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/tools/networking/toxvpn/default.nix
View File

@ -1,31 +1,23 @@
{ stdenv, fetchFromGitHub, libtoxcore, cmake, jsoncpp, lib, stdenvAdapters, libsodium, systemd, enableDebugging, libcap }: { stdenv, fetchFromGitHub, cmake, lib
, libtoxcore, jsoncpp, libsodium, systemd, libcap }:
with lib; with lib;
let stdenv.mkDerivation rec {
libtoxcoreLocked = stdenv.lib.overrideDerivation libtoxcore (oldAttrs: { name = "toxvpn-${version}";
name = "libtoxcore-2016-09-07"; version = "20161230";
src = fetchFromGitHub {
owner = "TokTok";
repo = "toxcore";
rev = "3521898b0cbf398d882496f6382f6c4ea1c23bc1";
sha256 = "1jvf0v9cqwd4ssj1iarhgsr05qg48v7yvmbnn3k01jy0lqci8iaq";
};
});
in stdenv.mkDerivation {
name = "toxvpn-2016-09-09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cleverca22"; owner = "cleverca22";
repo = "toxvpn"; repo = "toxvpn";
rev = "6e188f26fff8bddc1014ee3cc7a7423f9f344a09"; rev = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";
sha256 = "1bshc6pzk7z7q7g17cwx9gmlcyzn4szqvdiy0ihbk2xmx9k31c6p"; sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";
}; };
buildInputs = [ cmake libtoxcoreLocked jsoncpp libsodium libcap ] ++ optional (systemd != null) systemd; buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;
nativeBuildInputs = [ cmake ];
cmakeFlags = optional (systemd != null) [ "-DSYSTEMD=1" ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "A powerful tool that allows one to make tunneled point to point connections over Tox"; description = "A powerful tool that allows one to make tunneled point to point connections over Tox";