From c89fe1c0ee1c2ee05651f5df5c535f76cacededd Mon Sep 17 00:00:00 2001 From: Domen Kozar Date: Mon, 20 May 2013 11:15:11 +0200 Subject: [PATCH] python: first fix towards cross-compiling --- 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, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index f264e4179e70..411d3f400ade 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -29,9 +29,10 @@ let ./nix-store-mtime.patch ]; + nativeBuildInputs = [ bzip2 ]; + buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 ] + optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 9fb2ab377dfc..840d237f64a2 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -33,9 +33,11 @@ let ${stdenv.gcc.libc}/include/netinet/in.h ''; + nativeBuildInputs = [ bzip2 ]; + buildInputs = optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ - [ bzip2 openssl ] + [ 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 1471abe287a7..c24e0b013e33 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 bzip2 gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto + zlib gdbm sqlite db4 readline ncurses openssl tcl tk libX11 xproto ]; in stdenv.mkDerivation { @@ -45,12 +45,15 @@ stdenv.mkDerivation { ) ''; + nativeBuildInputs = [ bzip2 ]; + setupHook = ./setup-hook.sh; postInstall = '' rm -rf "$out/lib/python${majorVersion}/test" ''; + passthru = { zlibSupport = zlib != null; sqliteSupport = sqlite != null;