Merge staging-next into staging

2021-03-06 06:17:00 +00:00
parent 448b953d56 860fd89a37
commit fb5c8b556d
71 changed files with 2342 additions and 2424 deletions
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -60,7 +60,7 @@ in

    configureFlags = let
      isCross = stdenv.hostPlatform != stdenv.buildPlatform;
-      inherit (stdenv.hostPlatform) gcc isArch32;
+      inherit (stdenv.hostPlatform) gcc isAarch32;
    in sharedConfigureFlags ++ [
      "--without-dtrace"
    ] ++ (optionals isCross [