Merge master into staging-next

2021-01-27 12:24:05 +00:00
parent 6d452e839b 693c7cd0f7
commit 2137c13b40
93 changed files with 461 additions and 238 deletions
@@ -255,7 +255,7 @@ stdenv.mkDerivation ({

  inherit
    (import ../common/extra-target-flags.nix {
-      inherit stdenv crossStageStatic libcCross threadsCross;
+      inherit lib stdenv crossStageStatic libcCross threadsCross;
    })
    EXTRA_FLAGS_FOR_TARGET
    EXTRA_LDFLAGS_FOR_TARGET