Merge pull request #44081 from obsidiansystems/stdenv-cross-allowedRequisites

cross stdenv: Forget `allowedRequisites = nulll;` on inline

pkgs/stdenv/cross/default.nix

@@ -43,6 +43,7 @@ in lib.init bootStages ++ [
       # a different platform, and so are disabled.
       overrides = _: _: {};
       extraBuildInputs = [ ]; # Old ones run on wrong platform
+      allowedRequisites = null;
 
       cc = if crossSystem.useiOSPrebuilt or false
              then buildPackages.darwin.iosSdkPkgs.clang

pkgs/top-level/all-packages.nix

@@ -34,7 +34,8 @@ with pkgs;
       extraPackages = [];
       inherit bintools;
     };
-    allowedRequisites = stdenv.allowedRequisites ++ [ bintools ];
+    allowedRequisites =
+      lib.mapNullable (rs: rs ++ [ bintools ]) (stdenv.allowedRequisites or null);
   };
 
   # For convenience, allow callers to get the path to Nixpkgs.