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

zerotierone: use compile from the stdenv

Browse Source
This commit is contained in:
zimbatm 2016-06-30 12:28:50 +01:00
parent 4932524080
commit cbe5813e84
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute, ronn }: { stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
version = "1.1.6"; version = "1.1.6";
@ -10,10 +10,6 @@ stdenv.mkDerivation rec {
}; };
preConfigure = '' preConfigure = ''
substituteInPlace ./make-linux.mk \
--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 \ substituteInPlace ./osdep/LinuxEthernetTap.cpp \
--replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
@ -23,7 +19,7 @@ stdenv.mkDerivation rec {
--replace 'ronn -r' '${ronn}/bin/ronn -r' --replace 'ronn -r' '${ronn}/bin/ronn -r'
''; '';
buildInputs = [ openssl lzo zlib gcc iproute ronn ]; buildInputs = [ openssl lzo zlib iproute which ronn ];
installPhase = '' installPhase = ''
install -Dt "$out/bin/" zerotier-one install -Dt "$out/bin/" zerotier-one