From 8efac4fc98e0a7b1147812ab752b6dec66e9a40d Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 16 Mar 2020 18:16:43 +0200 Subject: [PATCH 1/2] zerotierone: fix build on armv7l via gcc9 --- pkgs/tools/networking/zerotierone/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index da5b8837523..63f0f8b17c5 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation rec { patchShebangs ./doc/build.sh substituteInPlace ./doc/build.sh \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ + + substituteInPlace ./make-linux.mk \ + --replace 'armv5' 'armv6' ''; From 795dcf890802b3bc23ea4ed40ab231d9cc240f15 Mon Sep 17 00:00:00 2001 From: misuzu Date: Mon, 16 Mar 2020 18:17:18 +0200 Subject: [PATCH 2/2] zerotierone: it supports all platforms --- 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 63f0f8b17c5..c060e6a61a4 100644 --- a/pkgs/tools/networking/zerotierone/default.nix +++ b/pkgs/tools/networking/zerotierone/default.nix @@ -50,6 +50,6 @@ stdenv.mkDerivation rec { homepage = https://www.zerotier.com; license = licenses.bsl11; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; - platforms = with platforms; x86_64 ++ aarch64 ++ arm; + platforms = platforms.all; }; }