diff options
| author | zimbatm <zimbatm@zimbatm.com> | 2016-06-30 12:28:50 +0100 |
|---|---|---|
| committer | zimbatm <zimbatm@zimbatm.com> | 2016-06-30 12:28:50 +0100 |
| commit | cbe5813e8433b76254f33a389f2bba6dd4b10253 (patch) | |
| tree | 3d4ccfd27b21905c232017b4da547a31536cfbb0 /pkgs/tools/networking/zerotierone | |
| parent | 4932524080c8e187f698927b21cb667b814cf0cd (diff) | |
| download | nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.tar nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.tar.gz nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.tar.bz2 nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.tar.lz nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.tar.xz nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.tar.zst nixpkgs-cbe5813e8433b76254f33a389f2bba6dd4b10253.zip | |
zerotierone: use compile from the stdenv
Diffstat (limited to 'pkgs/tools/networking/zerotierone')
| -rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 69529e8ba73..55be87f6a88 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, lzo, zlib, gcc, iproute, ronn }: +{ stdenv, fetchurl, openssl, lzo, zlib, iproute, which, ronn }: stdenv.mkDerivation rec { version = "1.1.6"; @@ -10,10 +10,6 @@ stdenv.mkDerivation rec { }; 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 \ --replace 'execlp("ip",' 'execlp("${iproute}/bin/ip",' @@ -23,7 +19,7 @@ stdenv.mkDerivation rec { --replace 'ronn -r' '${ronn}/bin/ronn -r' ''; - buildInputs = [ openssl lzo zlib gcc iproute ronn ]; + buildInputs = [ openssl lzo zlib iproute which ronn ]; installPhase = '' install -Dt "$out/bin/" zerotier-one |