diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-24 16:27:06 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-24 20:01:43 -0400 |
commit | 87b4a5d6a70dc08168edf81f4cbcfccc2c1dd919 (patch) | |
tree | da0be7c97016bd1ba6f57a252e7f48a6d86ba046 /pkgs/stdenv | |
parent | 6bee6b8f4b60a320c23aa221ffad18506984b280 (diff) |
stdenv: Remove crossAttrs, now that it is no longer used
Fix #33302
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
-rw-r--r-- | pkgs/stdenv/generic/make-derivation.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 18a9c7f380982..8268dd5b08962 100644 --- 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 {}); + }); }; diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 778f107f71e14..6afd4e3a05eb3 100644 --- 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" |