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

Merge pull request #9392 from danielfullmer/zerotierone-1.4

Browse Source 
zerotierone: 1.0.2 -> 1.0.4 and fix for hardcoded path
This commit is contained in:
Arseniy Seroka 2015-08-25 20:39:06 +03:00
commit f3f8506461
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/tools/networking/zerotierone/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, openssl, lzo, zlib, gcc }: { stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute }:
with stdenv.lib; with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.0.2"; version = "1.0.4";
name = "zerotierone"; name = "zerotierone";
src = fetchurl { src = fetchurl {
url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz"; url = "https://github.com/zerotier/ZeroTierOne/archive/${version}.tar.gz";
sha256 = "002ay4f6l9h79j1708klwjvinsv6asv24a0hql85jq27587sv6mq"; sha256 = "1klnsjajlas71flbf6w2q3iqhhqrmzqpd2g4qw9my66l7kcsbxfd";
}; };
preConfigure = '' 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"; --replace 'CC=$(shell which clang gcc cc 2>/dev/null | head -n 1)' "CC=${gcc}/bin/gcc";
substituteInPlace ./make-linux.mk \ substituteInPlace ./make-linux.mk \
--replace 'CXX=$(shell which clang++ g++ c++ 2>/dev/null | head -n 1)' "CC=${gcc}/bin/g++"; --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 = '' installPhase = ''
installBin zerotier-one installBin zerotier-one
ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool
ln -s $out/bin/zerotier-one $out/bin/zerotier-cli
''; '';
meta = { meta = {