Merge pull request #13530 from danielfullmer/zerotier-fix

zerotierone: hardcoded path fix
This commit is contained in:
Domen Kožar 2016-02-28 10:20:04 +00:00
commit 67b9053d29

View File

@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
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 \ substituteInPlace ./osdep/LinuxEthernetTap.cpp \
--replace '/sbin/ip' "${iproute}/bin/ip" --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",'
''; '';
buildInputs = [ openssl lzo zlib gcc iproute ]; buildInputs = [ openssl lzo zlib gcc iproute ];