Merge branch 'master' into staging-next

2021-01-24 00:09:45 +01:00
parent 58752914f4 f1778cd90e
commit 01ee4ea574
871 changed files with 3294 additions and 3821 deletions
--- a/pkgs/development/compilers/gcc/common/platform-flags.nix
+++ b/pkgs/development/compilers/gcc/common/platform-flags.nix
@@ -1,7 +1,7 @@
 { lib, targetPlatform }:

 let
-  p =  targetPlatform.platform.gcc or {}
+  p =  targetPlatform.gcc or {}
    // targetPlatform.parsed.abi;
 in lib.concatLists [
  (lib.optional (!targetPlatform.isx86_64 && p ? arch) "--with-arch=${p.arch}") # --with-arch= is unknown flag on x86_64