b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #65605 from danielfullmer/zerotier-1.4.0

Browse source 
zerotierone: 1.2.12 -> 1.4.0
This commit is contained in:
worldofpeace 2019-07-31 01:13:00 -04:00 committed by GitHub
parent 6a79f6fb71 8c975f2f38
commit 4b1dd1c3a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkgs/tools/networking/zerotierone/default.nix
View file

@ -1,12 +1,14 @@
{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
{ stdenv, fetchFromGitHub, openssl, lzo, zlib, iproute, which, ronn }:
stdenv.mkDerivation rec {
version = "1.2.12";
name = "zerotierone-${version}";
pname = "zerotierone";
version = "1.4.0";
src = fetchurl {
url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
sha256 = "1m7ynrgzpg2sp37hcmjkx6w173icfhakzn1c1zrdzrxmmszrj9r1";
src = fetchFromGitHub {
owner = "zerotier";
repo = "ZeroTierOne";
rev = version;
sha256 = "14iwhlxmxsnvnm9rrp6rysiz461w0v5nsmnz5p91rfi351103a63";
};
preConfigure = ''
@ -16,9 +18,6 @@ stdenv.mkDerivation rec {
substituteInPlace ./osdep/ManagedRoute.cpp \
--replace '/sbin/ip' '${iproute}/bin/ip'
substituteInPlace ./osdep/LinuxEthernetTap.cpp \
--replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
patchShebangs ./doc/build.sh
substituteInPlace ./doc/build.sh \
--replace '/usr/bin/ronn' '${ronn}/bin/ronn' \