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

toxvpn: 2017-06-25 -> 2018-04-17

Browse Source
This commit is contained in:
Peter Hoeg 2018-04-19 18:21:25 +08:00
parent 8ce6587966
commit 8811d1d384
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,25 +1,22 @@
{ stdenv, fetchFromGitHub, cmake, nlohmann_json, { stdenv, fetchFromGitHub, cmake, nlohmann_json,
libtoxcore, libsodium, systemd, libcap, zeromq }: libtoxcore, libsodium, libcap, zeromq,
systemd ? null }:
with stdenv.lib; with stdenv.lib;
let stdenv.mkDerivation rec {
systemdOrNull = if stdenv.system == "x86_64-darwin" then null else systemd; name = "toxvpn-2018-04-17";
if_systemd = optional (systemdOrNull != null);
in stdenv.mkDerivation rec {
name = "toxvpn-${version}";
version = "2017-06-25";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cleverca22"; owner = "cleverca22";
repo = "toxvpn"; repo = "toxvpn";
rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; rev = "dc766f98888f500ea51f002f59007eac3f3a0a06";
sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz";
}; };
buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ]
++ if_systemd systemd ++ optionals stdenv.isLinux [ libcap systemd ];
++ optional (stdenv.system != "x86_64-darwin") libcap;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake ];
cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ];

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

@ -5220,7 +5220,7 @@ with pkgs;
torsocks = callPackage ../tools/security/tor/torsocks.nix { }; torsocks = callPackage ../tools/security/tor/torsocks.nix { };
toxvpn = callPackage ../tools/networking/toxvpn { }; toxvpn = callPackage ../tools/networking/toxvpn { libtoxcore = libtoxcore_0_1; };
tpmmanager = callPackage ../applications/misc/tpmmanager { }; tpmmanager = callPackage ../applications/misc/tpmmanager { };