public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "python: first fix towards cross-compiling" 

This reverts commit c89fe1c0ee.
This commit is contained in:
Domen Kozar 2013-05-20 12:03:58 +02:00
parent c9bae2bcbe
commit 541f2ad531
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/development/interpreters/python/2.6/default.nix
View File

@ -29,10 +29,9 @@ 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;

4
pkgs/development/interpreters/python/2.7/default.nix
View File

@ -33,11 +33,9 @@ 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 ++
[ openssl ] [ bzip2 openssl ]
++ optional zlibSupport zlib; ++ optional zlibSupport zlib;
ensurePurity = ensurePurity =

5
pkgs/development/interpreters/python/3.3/default.nix
View File

@ -20,7 +20,7 @@ let
version = "${majorVersion}.1"; version = "${majorVersion}.1";
buildInputs = filter (p: p != null) [ 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 in
stdenv.mkDerivation { stdenv.mkDerivation {
@ -45,15 +45,12 @@ 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;