diff options
author | michael bishop <cleverca22@gmail.com> | 2017-06-25 20:17:20 -0300 |
---|---|---|
committer | michael bishop <cleverca22@gmail.com> | 2017-06-25 20:17:20 -0300 |
commit | bb16bced36be4f61d19c7472ecb14949eb2d6914 (patch) | |
tree | 3b73ebd97cabda1acea863855560ab157e868750 /pkgs/tools/networking/toxvpn | |
parent | bd63daae03d6a3c014d0b5a526f2698c60f69e6f (diff) |
toxvpn: 20161230 -> 2017-06-25
Diffstat (limited to 'pkgs/tools/networking/toxvpn')
-rw-r--r-- | pkgs/tools/networking/toxvpn/default.nix | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index 05e833f2f8ef4..c7fa1c7a27194 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -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; }; } |