From 508fc749f483318e2a7f700012534f24f96dd1d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Sat, 21 Aug 2010 16:57:24 +0000
Subject: [PATCH] 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
---
 pkgs/development/tools/misc/texinfo/default.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/tools/misc/texinfo/default.nix b/pkgs/development/tools/misc/texinfo/default.nix
index 09fe6ed029c..95d98582549 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;