diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix index c9bf4eea405..09fe6ed029c 100644 --- a/pkgs/development/tools/misc/texinfo/default.nix +++ b/pkgs/development/tools/misc/texinfo/default.nix @@ -10,6 +10,15 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses lzma ]; + # !!! This should be set as usual attributes - we set them as + # crossAttrs only not to change the usual stdenv hash + # (in the normal stdenv, these get mapped all to buildNativeInputs, + # but unfortunately in the opposite order, thus getting a new hash) + crossAttrs = { + buildNativeInputs = [ lzma ]; + buildInputs = [ ncurses ]; + }; + # Disabled because we don't have zdiff in the stdenv bootstrap. #doCheck = true; diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 33e1f8505d2..f1babf2dfb2 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 191dd54c6ae..fa9c18b2c37 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 [];