ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #26863 from cleverca22/update-toxvpn

Browse Source 
toxvpn: 20161230 -> 2017-06-25
This commit is contained in:
Franz Pletz 2017-06-26 03:51:51 +02:00 committed by GitHub
commit d4002bd6d4
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nixos/modules/services/networking/toxvpn.nix
View File

@ -18,6 +18,13 @@ with lib;
default = 33445;
description = "udp port for toxcore, port-forward to help with connectivity if you run many nodes behind one NAT";
};
auto_add_peers = mkOption {
type = types.listOf types.string;
default = [];
example = ''[ "toxid1" "toxid2" ]'';
description = "peers to automacally connect to on startup";
};
};
};
@ -33,8 +40,13 @@ with lib;
chown toxvpn /run/toxvpn
'';
path = [ pkgs.toxvpn ];
script = ''
exec toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port} ${lib.concatMapStringsSep " " (x: "-a ${x}") config.services.toxvpn.auto_add_peers}
'';
serviceConfig = {
ExecStart = "${pkgs.toxvpn}/bin/toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port}";
KillMode = "process";
Restart = "on-success";
Type = "notify";
@ -43,6 +55,8 @@ with lib;
restartIfChanged = false; # Likely to be used for remote admin
};
environment.systemPackages = [ pkgs.toxvpn ];
users.extraUsers = {
toxvpn = {
uid = config.ids.uids.toxvpn;

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

@ -1,29 +1,36 @@
{ stdenv, fetchFromGitHub, cmake, lib
, libtoxcore, jsoncpp, libsodium, systemd, libcap }:
{ stdenv, fetchFromGitHub, cmake, nlohmann_json,
libtoxcore, libsodium, systemd, libcap, zeromq }:
with lib;
with stdenv.lib;
stdenv.mkDerivation rec {
let
systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd;
if_systemd = optional (systemdOrNull != null);
in stdenv.mkDerivation rec {
name = "toxvpn-${version}";
version = "20161230";
version = "2017-06-25";
src = fetchFromGitHub {
owner = "cleverca22";
repo = "toxvpn";
rev = "4b7498a5fae680484cb5779ac01fb08ad3089bdd";
sha256 = "0bazdspiym9xyzms7pd6i1f2gph13rnf764nm3jc27fbfwmc98rp";
rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44";
sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0";
};
buildInputs = [ libtoxcore jsoncpp libsodium libcap ] ++ optional stdenv.isLinux systemd;
buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
++ if_systemd systemd
++ optional (stdenv.system != "x86_64-darwin") libcap;
nativeBuildInputs = [ cmake ];
cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];
postInstall = "$out/bin/toxvpn -h";
meta = with stdenv.lib; {
description = "A powerful tool that allows one to make tunneled point to point connections over Tox";
homepage = https://github.com/cleverca22/toxvpn;
license = licenses.gpl3;
maintainers = with maintainers; [ cleverca22 obadz ];
platforms = platforms.linux;
platforms = platforms.linux ++ platforms.darwin;
};
}