diff options
| author | Daniel Fullmer <daniel.fullmer@yale.edu> | 2015-08-21 23:06:50 +0000 |
|---|---|---|
| committer | Daniel Fullmer <daniel.fullmer@yale.edu> | 2015-08-21 23:06:50 +0000 |
| commit | e23ee274b62937ff926807aca9371bc12b574dbe (patch) | |
| tree | 2c61343b7de56bfd3b14d542001faab70ec1a963 /pkgs/tools/networking/zerotierone | |
| parent | 13576925552b1d0751498fdda22e91a055a1ff6c (diff) | |
| download | nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.tar nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.tar.gz nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.tar.bz2 nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.tar.lz nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.tar.xz nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.tar.zst nixlib-e23ee274b62937ff926807aca9371bc12b574dbe.zip | |
zerotierone: 1.0.2 -> 1.0.4 and fix for hardcoded path
Diffstat (limited to 'pkgs/tools/networking/zerotierone')
| -rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index b08edaa0fc67..c6a456e202ab 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, gcc }: +{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }: with stdenv.lib; stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.0.4"; name = "zerotierone"; src = fetchurl { url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; - sha256 = "002ay4f6l9h79j1708klwjvinsv6asv24a0hql85jq27587sv6mq"; + sha256 = "1klnsjajlas71flbf6w2q3iqhhqrmzqpd2g4qw9my66l7kcsbxfd"; }; preConfigure = '' @@ -16,12 +16,16 @@ stdenv.mkDerivation rec { --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc"; substituteInPlace ./make-linux.mk \ --replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; + substituteInPlace ./osdep/LinuxEthernetTap.cpp \ + --replace '/sbin/ip' "${iproute}/bin/ip" ''; - buildInputs = [ openssl lzo zlib gcc ]; + buildInputs = [ openssl lzo zlib gcc iproute ]; installPhase = '' installBin zerotier-one + ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool + ln -s $out/bin/zerotier-one $out/bin/zerotier-cli ''; meta = { |