Merge master into staging-next

2021-04-15 12:06:13 +00:00
parent 8b35f0c117 081b9423d4
commit 9c190d28df
22 changed files with 218 additions and 97 deletions
@@ -238,7 +238,7 @@ in
        buildPlatform hostPlatform targetPlatform
        initialPath shell fetchurlBoot;

-      cc = import ../../build-support/cc-wrapper {
+      cc = lib.makeOverridable (import ../../build-support/cc-wrapper) {
        inherit lib;
        nativeTools  = true;
        nativePrefix = "/usr";