From 541f2ad53168f4066e3de9310fdaff8bbd6e9a37 Mon Sep 17 00:00:00 2001
From: Domen Kozar <domen@dev.si>
Date: Mon, 20 May 2013 12:03:58 +0200
Subject: [PATCH] Revert "python: first fix towards cross-compiling"

This reverts commit c89fe1c0ee1c2ee05651f5df5c535f76cacededd.
---
 pkgs/development/interpreters/python/2.6/default.nix | 5 ++---
 pkgs/development/interpreters/python/2.7/default.nix | 4 +---
 pkgs/development/interpreters/python/3.3/default.nix | 5 +----
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix
index 411d3f400ad..f264e4179e7 100644
--- a/pkgs/development/interpreters/python/2.6/default.nix
+++ b/pkgs/development/interpreters/python/2.6/default.nix
@@ -29,10 +29,9 @@ let
       ./nix-store-mtime.patch
     ];
 
-  nativeBuildInputs = [ bzip2 ];
-
   buildInputs =
-    optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc
+    optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
+    [ bzip2 ]
     ++ optional zlibSupport zlib;
 
     
diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix
index 840d237f64a..9fb2ab377df 100644
--- a/pkgs/development/interpreters/python/2.7/default.nix
+++ b/pkgs/development/interpreters/python/2.7/default.nix
@@ -33,11 +33,9 @@ let
                                 ${stdenv.gcc.libc}/include/netinet/in.h
   '';
 
-  nativeBuildInputs = [ bzip2 ];
-
   buildInputs =
     optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
-    [ openssl ]
+    [ bzip2 openssl ]
     ++ optional zlibSupport zlib;
 
   ensurePurity =
diff --git a/pkgs/development/interpreters/python/3.3/default.nix b/pkgs/development/interpreters/python/3.3/default.nix
index c24e0b013e3..1471abe287a 100644
--- a/pkgs/development/interpreters/python/3.3/default.nix
+++ b/pkgs/development/interpreters/python/3.3/default.nix
@@ -20,7 +20,7 @@ let
   version = "${majorVersion}.1";
 
   buildInputs = filter (p: p != null) [
-    zlib gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
+    zlib bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto
   ];
 in
 stdenv.mkDerivation {
@@ -45,15 +45,12 @@ stdenv.mkDerivation {
                         )
   '';
 
-  nativeBuildInputs = [ bzip2 ];
-
   setupHook = ./setup-hook.sh;
 
   postInstall = ''
     rm -rf "$out/lib/python${majorVersion}/test"
   '';
 
-
   passthru = {
     zlibSupport = zlib != null;
     sqliteSupport = sqlite != null;