diff options
| author | Peter Hoeg <peter@hoeg.com> | 2018-04-30 04:07:30 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-30 04:07:30 +0000 |
| commit | 12d89a7ed960243955f3fa8b4de8ac5b38018890 (patch) | |
| tree | 6488afb9ed56cd53542e340b85e0690cd9fa02f4 /pkgs/tools/networking | |
| parent | cf194a93115ac1354f0e49f49c1f44aac74b3d6d (diff) | |
| parent | 8811d1d384d38962927450cf8f69d675f72ee80a (diff) | |
| download | nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.tar nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.tar.gz nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.tar.bz2 nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.tar.lz nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.tar.xz nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.tar.zst nixlib-12d89a7ed960243955f3fa8b4de8ac5b38018890.zip | |
Merge pull request #39147 from peterhoeg/u/tox
tox: libtoxcore and assorted tox client updates
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/toxvpn/default.nix | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/pkgs/tools/networking/toxvpn/default.nix b/pkgs/tools/networking/toxvpn/default.nix index c7fa1c7a2719..ccb9f3bc0d6b 100644 --- a/pkgs/tools/networking/toxvpn/default.nix +++ b/pkgs/tools/networking/toxvpn/default.nix @@ -1,25 +1,22 @@ { stdenv, fetchFromGitHub, cmake, nlohmann_json, -libtoxcore, libsodium, systemd, libcap, zeromq }: + libtoxcore, libsodium, libcap, zeromq, + systemd ? null }: with stdenv.lib; -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 = "2017-06-25"; +stdenv.mkDerivation rec { + name = "toxvpn-2018-04-17"; src = fetchFromGitHub { owner = "cleverca22"; repo = "toxvpn"; - rev = "7bd6f169d69c511affa8c9672e8f794e4e205a44"; - sha256 = "1km8hkrxmrnca1b49vbw5kyldayaln5plvz78vhf8325r6c5san0"; + rev = "dc766f98888f500ea51f002f59007eac3f3a0a06"; + sha256 = "19br3fmrdm45fvymj9kvwikkn8m657yd5fkhx6grv35ckrj83mxz"; }; buildInputs = [ libtoxcore nlohmann_json libsodium zeromq ] - ++ if_systemd systemd - ++ optional (stdenv.system != "x86_64-darwin") libcap; + ++ optionals stdenv.isLinux [ libcap systemd ]; + nativeBuildInputs = [ cmake ]; cmakeFlags = optional stdenv.isLinux [ "-DSYSTEMD=1" ]; |