python: first fix towards cross-compiling

This commit is contained in:
Domen Kozar 2013-05-20 11:15:11 +02:00
parent 8b79a00c44
commit c89fe1c0ee
3 changed files with 10 additions and 4 deletions

View File

@ -29,9 +29,10 @@ let
./nix-store-mtime.patch ./nix-store-mtime.patch
]; ];
nativeBuildInputs = [ bzip2 ];
buildInputs = 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; ++ optional zlibSupport zlib;

View File

@ -33,9 +33,11 @@ let
${stdenv.gcc.libc}/include/netinet/in.h ${stdenv.gcc.libc}/include/netinet/in.h
''; '';
nativeBuildInputs = [ bzip2 ];
buildInputs = buildInputs =
optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++
[ bzip2 openssl ] [ openssl ]
++ optional zlibSupport zlib; ++ optional zlibSupport zlib;
ensurePurity = ensurePurity =

View File

@ -20,7 +20,7 @@ let
version = "${majorVersion}.1"; version = "${majorVersion}.1";
buildInputs = filter (p: p != null) [ 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -45,12 +45,15 @@ stdenv.mkDerivation {
) )
''; '';
nativeBuildInputs = [ bzip2 ];
setupHook = ./setup-hook.sh; setupHook = ./setup-hook.sh;
postInstall = '' postInstall = ''
rm -rf "$out/lib/python${majorVersion}/test" rm -rf "$out/lib/python${majorVersion}/test"
''; '';
passthru = { passthru = {
zlibSupport = zlib != null; zlibSupport = zlib != null;
sqliteSupport = sqlite != null; sqliteSupport = sqlite != null;