diff options
| author | Daniel Fullmer <danielrf12@gmail.com> | 2020-01-03 20:10:37 -0500 |
|---|---|---|
| committer | Daniel Fullmer <danielrf12@gmail.com> | 2020-01-03 20:26:42 -0500 |
| commit | 44d0aed67797a35c68a28f9a1a618dd2ee8be4a3 (patch) | |
| tree | 07f46661106870116fa75b349dd01e19a28226dc /pkgs/tools/networking | |
| parent | b0bbacb52134a7e731e549f4c0a7a2a39ca6b481 (diff) | |
| download | nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.tar nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.tar.gz nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.tar.bz2 nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.tar.lz nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.tar.xz nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.tar.zst nixpkgs-44d0aed67797a35c68a28f9a1a618dd2ee8be4a3.zip | |
zerotierone: fix cross compilation
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index 58f2e816008..b43626ed30e 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, openssl, lzo, zlib, iproute, which, ronn }: +{ stdenv, buildPackages, fetchFromGitHub, openssl, lzo, zlib, iproute, ronn }: stdenv.mkDerivation rec { pname = "zerotierone"; @@ -20,11 +20,14 @@ stdenv.mkDerivation rec { patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ - --replace '/usr/bin/ronn' '${ronn}/bin/ronn' \ - --replace 'ronn -r' '${ronn}/bin/ronn -r' + --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ ''; - buildInputs = [ openssl lzo zlib iproute which ronn ]; + + nativeBuildInputs = [ ronn ]; + buildInputs = [ openssl lzo zlib iproute ]; + + enableParallelBuilding = true; installPhase = '' install -Dt "$out/bin/" zerotier-one |