From 44d0aed67797a35c68a28f9a1a618dd2ee8be4a3 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 3 Jan 2020 20:10:37 -0500 Subject: [PATCH 1/3] zerotierone: fix cross compilation --- pkgs/tools/networking/zerotierone/default.nix | 11 +++++++---- 1 file 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 From 7fffda016c81689dfc7b037eaf729762dc0a2a74 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 3 Jan 2020 20:10:55 -0500 Subject: [PATCH 2/3] zerotierone: add danielfullmer as maintainer --- pkgs/tools/networking/zerotierone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index b43626ed30e..dd4b9aed488 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { description = "Create flat virtual Ethernet networks of almost unlimited size"; homepage = https://www.zerotier.com; license = licenses.bsl11; - maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz ]; + maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; platforms = platforms.x86_64 ++ platforms.aarch64; }; } From 115534cf8c8219402b3870d157cbc8b198fd8d24 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Fri, 3 Jan 2020 20:20:05 -0500 Subject: [PATCH 3/3] zerotierone: add arm platform Tested on raspberry pi 1. --- pkgs/tools/networking/zerotierone/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index dd4b9aed488..da5b8837523 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -47,6 +47,6 @@ stdenv.mkDerivation rec { homepage = https://www.zerotier.com; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = platforms.x86_64 ++ platforms.aarch64; + platforms = with platforms; x86_64 ++ aarch64 ++ arm; }; }