diff options
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/adapters.nix | 2 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 33e1f8505d273..f1babf2dfb28c 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -170,7 +170,7 @@ rec { propagatedBuildNativeInputs = propagatedBuildNativeInputsDrvs; crossConfig = cross.config; - }); + } // (if args ? crossAttrs then args.crossAttrs else {})); in buildDrv // { inherit hostDrv buildDrv; }; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index 191dd54c6aea4..fa9c18b2c3749 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -44,7 +44,7 @@ let # stdenv and its shell. mkDerivation = attrs: (derivation ( - (removeAttrs attrs ["meta" "passthru"]) + (removeAttrs attrs ["meta" "passthru" "crossAttrs"]) // (let buildInputs = if attrs ? buildInputs then attrs.buildInputs else []; |