Merge remote-tracking branch 'origin/master' into staging-next

Fix cargo-flash build
2021-05-16 18:27:14 -07:00
parent 6020fe2508 8aea69e5ab
commit d8e62d8e41
80 changed files with 906 additions and 354 deletions
@@ -18,5 +18,6 @@ substituteAll {
  inherit runtimeShell nix;
  nix_x86_64_linux = fallback.x86_64-linux;
  nix_i686_linux = fallback.i686-linux;
+  nix_aarch64_linux = fallback.aarch64-linux;
  path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
 }
@@ -386,6 +386,8 @@ prebuiltNix() {
        echo @nix_x86_64_linux@
    elif [[ "$machine" =~ i.86 ]]; then
        echo @nix_i686_linux@
+    elif [[ "$machine" = aarch64 ]]; then
+        echo @nix_aarch64_linux@
    else
        echo "$0: unsupported platform"
        exit 1