Revert "python: first fix towards cross-compiling"
This reverts commit c89fe1c0ee
.
This commit is contained in:
parent
c9bae2bcbe
commit
541f2ad531
|
@ -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;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -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 =
|
||||||
|
|
|
@ -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;
|
||||||
|
|
Loading…
Reference in New Issue