diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 01:51:13 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-03-24 01:51:13 +0100 |
| commit | cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4 (patch) | |
| tree | 6534f00bf85774daac26bb0d592f370ee9fb59b7 /pkgs/tools/networking/zerotierone/default.nix | |
| parent | 9fd82b3e7e99678dab327332bcffec4aad01d22b (diff) | |
| parent | 0bfd0187dafe3f597355e6be16b7b9a5f4b90376 (diff) | |
| download | nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.gz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.bz2 nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.lz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.xz nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.tar.zst nixlib-cbd504c0ae8eb3be7cbf0e28eee3d85c9d6b7ce4.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/networking/zerotierone/default.nix')
| -rw-r--r-- | pkgs/tools/networking/zerotierone/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/networking/zerotierone/default.nix b/pkgs/tools/networking/zerotierone/default.nix index da5b8837523d..2a3987f490ff 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' ''; @@ -29,6 +32,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + buildFlags = [ "all" "selftest" ]; + + doCheck = stdenv.hostPlatform == stdenv.buildPlatform; + checkPhase = '' + ./zerotier-selftest + ''; + installPhase = '' install -Dt "$out/bin/" zerotier-one ln -s $out/bin/zerotier-one $out/bin/zerotier-idtool @@ -47,6 +57,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; }; } |