public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #82733 from misuzu/zerotierone-armv7l-fix

Browse Source 
zerotierone: fix build on armv7l via gcc9
This commit is contained in:
zimbatm 2020-03-16 20:41:22 +01:00 committed by GitHub
commit 70519e57af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/networking/zerotierone/default.nix
View File

@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
patchShebangs ./doc/build.sh patchShebangs ./doc/build.sh
substituteInPlace ./doc/build.sh \ substituteInPlace ./doc/build.sh \
--replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \ --replace '/usr/bin/ronn' '${buildPackages.ronn}/bin/ronn' \
substituteInPlace ./make-linux.mk \
--replace 'armv5' 'armv6'
''; '';
@ -47,6 +50,6 @@ stdenv.mkDerivation rec {
homepage = https://www.zerotier.com; homepage = https://www.zerotier.com;
license = licenses.bsl11; license = licenses.bsl11;
maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ]; maintainers = with maintainers; [ sjmackenzie zimbatm ehmry obadz danielfullmer ];
platforms = with platforms; x86_64 ++ aarch64 ++ arm; platforms = platforms.all;
}; };
} }