Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 947043ab94a0
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 48f461d8c323
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 4, 2020

  1. zerotierone: fix cross compilation

    @danielfullmer
    danielfullmer committed Jan 4, 2020
    Copy the full SHA
    44d0aed View commit details

  2. zerotierone: add danielfullmer as maintainer

    @danielfullmer
    danielfullmer committed Jan 4, 2020
    Copy the full SHA
    7fffda0 View commit details

  3. zerotierone: add arm platform 

    Tested on raspberry pi 1.
    @danielfullmer
    danielfullmer committed Jan 4, 2020
    Copy the full SHA
    115534c View commit details

  4. Merge pull request #76916 from danielfullmer/zerotierone-cross 

    zerotierone: fix cross compilation
    @zimbatm
    zimbatm authored Jan 4, 2020
    Copy the full SHA
    48f461d View commit details
Showing with 9 additions and 6 deletions.
  1. +9 −6 pkgs/tools/networking/zerotierone/default.nix
15 changes: 9 additions & 6 deletions pkgs/tools/networking/zerotierone/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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
@@ -43,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 ];
platforms = platforms.x86_64 ++ platforms.aarch64;
maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ];
platforms = with platforms; x86_64 ++ aarch64 ++ arm;
};
}