mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 21:50:55 +00:00
python2: Use system libffi on Aarch64
libffi needs a patch to actually work on aarch64 (or the cffi Python package fails its testsuite). Of course the bundled version of libffi has the same bug, so don't use the buggy version on aarch64. Python3 already uses the system libffi on all platforms. I don't know why Python2 doesn't.
This commit is contained in:
parent
65445212df
commit
a0a8f0ac87
|
@ -110,8 +110,9 @@ let
|
|||
"--enable-shared"
|
||||
"--with-threads"
|
||||
"--enable-unicode=ucs4"
|
||||
] ++ optionals hostPlatform.isCygwin [
|
||||
] ++ optionals (hostPlatform.isCygwin || hostPlatform.isAarch64) [
|
||||
"--with-system-ffi"
|
||||
] ++ optionals hostPlatform.isCygwin [
|
||||
"--with-system-expat"
|
||||
"ac_cv_func_bind_textdomain_codeset=yes"
|
||||
] ++ optionals stdenv.isDarwin [
|
||||
|
@ -125,7 +126,8 @@ let
|
|||
buildInputs =
|
||||
optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++
|
||||
[ bzip2 openssl zlib ]
|
||||
++ optionals hostPlatform.isCygwin [ expat libffi ]
|
||||
++ optional (hostPlatform.isCygwin || hostPlatform.isAarch64) libffi
|
||||
++ optional hostPlatform.isCygwin expat
|
||||
++ [ db gdbm ncurses sqlite readline ]
|
||||
++ optionals x11Support [ tcl tk xlibsWrapper libX11 ]
|
||||
++ optionals stdenv.isDarwin [ CF configd ];
|
||||
|
|
Loading…
Reference in a new issue