stdenv: do not pass crossOverlays redundantly (#528635)

pkgs/stdenv/cross/default.nix

@@ -4,7 +4,7 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
+  crossOverlays,
 }:
 
 let

pkgs/stdenv/custom/default.nix

@@ -4,7 +4,6 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
 }:
 
 assert crossSystem == localSystem;

pkgs/stdenv/darwin/default.nix

@@ -13,7 +13,6 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
   # Allow passing in bootstrap files directly so we can test the stdenv bootstrap process when changing the bootstrap tools
   bootstrapFiles ? (config.replaceBootstrapFiles or lib.id) (
     if localSystem.isAarch64 then

pkgs/stdenv/default.nix

@@ -12,32 +12,41 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
-}@args:
+  crossOverlays,
+}:
 
 let
+  commonArgs = {
+    inherit
+      lib
+      localSystem
+      crossSystem
+      config
+      overlays
+      ;
+  };
   # The native (i.e., impure) build environment.  This one uses the
   # tools installed on the system outside of the Nix environment,
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  stagesNative = import ./native args;
+  stagesNative = import ./native commonArgs;
 
   # The Nix build environment.
-  stagesNix = import ./nix (args // { bootStages = stagesNative; });
+  stagesNix = import ./nix (commonArgs // { bootStages = stagesNative; });
 
-  stagesFreeBSD = import ./freebsd args;
+  stagesFreeBSD = import ./freebsd commonArgs;
 
   # On Linux systems, the standard build environment consists of Nix-built
   # instances glibc and the `standard' Unix tools, i.e., the Posix utilities,
   # the GNU C compiler, and so on.
-  stagesLinux = import ./linux args;
+  stagesLinux = import ./linux commonArgs;
 
-  stagesDarwin = import ./darwin args;
+  stagesDarwin = import ./darwin commonArgs;
 
-  stagesCross = import ./cross args;
+  stagesCross = import ./cross (commonArgs // { inherit crossOverlays; });
 
-  stagesCustom = import ./custom args;
+  stagesCustom = import ./custom commonArgs;
 
 in
 # Select the appropriate stages for the platform `system'.

pkgs/stdenv/freebsd/default.nix

@@ -6,7 +6,6 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
   bootstrapFiles ?
     let
       table = {

pkgs/stdenv/linux/default.nix

@@ -59,8 +59,6 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
-
   bootstrapFiles ?
     let
       table = {

pkgs/stdenv/native/default.nix

@@ -4,7 +4,6 @@
   crossSystem,
   config,
   overlays,
-  crossOverlays ? [ ],
 }:
 
 assert crossSystem == localSystem;

pkgs/stdenv/nix/default.nix

@@ -1,11 +1,10 @@
 {
   lib,
-  crossSystem,
   localSystem,
+  crossSystem,
   config,
   overlays,
   bootStages,
-  ...
 }:
 
 assert crossSystem == localSystem;

pkgs/top-level/impure.nix

@@ -44,8 +44,6 @@ in
   # fix-point made by Nixpkgs.
   overlays ? import ./impure-overlays.nix,
 
-  crossOverlays ? [ ],
-
   ...
 }@args: