Making texinfo look nicer related to cross-build (we had some cleaning up to do for the time when we rebuild stdenv. It looks like a good time for that)

svn path=/nixpkgs/branches/stdenv-updates/; revision=23316

1 files changed, 2 insertions, 10 deletions

diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index 09fe6ed029c3..95d98582549e 100644
--- a/pkgs/development/tools/misc/texinfo/default.nix
+++ b/pkgs/development/tools/misc/texinfo/default.nix
@@ -8,16 +8,8 @@ stdenv.mkDerivation rec {
     sha256 = "1rf9ckpqwixj65bw469i634897xwlgkm5i9g2hv3avl6mv7b0a3d";
   };
 
-  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 ];
-  };
+  buildInputs = [ ncurses ];
+  buildNativeINputs = [ lzma ];
 
   # Disabled because we don't have zdiff in the stdenv bootstrap.
   #doCheck = true;