top-level: Close over fewer arguments for stdenv stages

This makes the flow of data easier to understand. There's little downside
because the args in question are already inspected by the stdenvs.

cross-compiling in particular is simpler because we don't need to worry
about overriding the config closed over by `allPackages`.

1 files changed, 6 insertions, 3 deletions

diff --git a/pkgs/stdenv/custom/default.nix b/pkgs/stdenv/custom/default.nix
index e8f203d69cf..174b8593c0a 100644
--- a/pkgs/stdenv/custom/default.nix
+++ b/pkgs/stdenv/custom/default.nix
@@ -1,10 +1,13 @@
-{ system, allPackages, platform, crossSystem, config, ... } @ args:
+{ lib, allPackages
+, system, platform, crossSystem, config
+}:
 
 rec {
-  vanillaStdenv = import ../. (args // {
+  vanillaStdenv = import ../. {
+    inherit lib allPackages system platform crossSystem;
     # Remove config.replaceStdenv to ensure termination.
     config = builtins.removeAttrs config [ "replaceStdenv" ];
-  });
+  };
 
   buildPackages = allPackages {
     inherit system platform crossSystem config;