stdenv: Remove crossAttrs, now that it is no longer used

Fix #33302
2018-07-24 16:27:06 -04:00 · 2018-07-24 16:27:06 -04:00 · 87b4a5d6a7
commit 87b4a5d6a7
parent 6bee6b8f4b
2 changed files with 2 additions and 2 deletions
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@ -87,7 +87,7 @@ rec {
                 (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
                 pkgs.updateAutotoolsGnuConfigScriptsHook
            ;
-        } // args.crossAttrs or {});
+        });
  };


--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@ -164,7 +164,7 @@ rec {

      derivationArg =
        (removeAttrs attrs
-          ["meta" "passthru" "crossAttrs" "pos"
+          ["meta" "passthru" "pos"
           "doCheck" "doInstallCheck"
           "checkInputs" "installCheckInputs"
           "__impureHostDeps" "__propagatedImpureHostDeps"