public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Fix #33302
This commit is contained in:
John Ericson 2018-07-24 16:27:06 -04:00
parent 6bee6b8f4b
commit 87b4a5d6a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/stdenv/adapters.nix
View File

@ -87,7 +87,7 @@ rec {
(hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl") (hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
pkgs.updateAutotoolsGnuConfigScriptsHook pkgs.updateAutotoolsGnuConfigScriptsHook
; ;
} // args.crossAttrs or {}); });
}; };

2
pkgs/stdenv/generic/make-derivation.nix
View File

@ -164,7 +164,7 @@ rec {
derivationArg = derivationArg =
(removeAttrs attrs (removeAttrs attrs
["meta" "passthru" "crossAttrs" "pos" ["meta" "passthru" "pos"
"doCheck" "doInstallCheck" "doCheck" "doInstallCheck"
"checkInputs" "installCheckInputs" "checkInputs" "installCheckInputs"
"__impureHostDeps" "__propagatedImpureHostDeps" "__impureHostDeps" "__propagatedImpureHostDeps"