diff options
| author | Thiago Kenji Okada <thiagokokada@gmail.com> | 2023-01-05 15:41:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-05 15:41:16 +0000 |
| commit | 9931561de355f2e5ce3f2753ad99010890b58a8a (patch) | |
| tree | 5c862e57d8d3a2940722971c952d52e361f12672 | |
| parent | Merge pull request #209051 from urandom2/wordpress (diff) | |
| parent | python27: use ffi/expat as system libraries (diff) | |
| download | nixpkgs-9931561de355f2e5ce3f2753ad99010890b58a8a.tar.gz | |
Merge pull request #209172 from NixOS/backport-206642-to-release-22.11
[Backport release-22.11] python27: use ffi/expat as system libraries
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index 684088186a0a..4f3c533005fb 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -194,11 +194,10 @@ let "--enable-shared" ] ++ [ "--with-threads" - "--enable-unicode=ucs${toString ucsEncoding}" - ] ++ optionals (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) [ "--with-system-ffi" - ] ++ optionals stdenv.hostPlatform.isCygwin [ "--with-system-expat" + "--enable-unicode=ucs${toString ucsEncoding}" + ] ++ optionals stdenv.hostPlatform.isCygwin [ "ac_cv_func_bind_textdomain_codeset=yes" ] ++ optionals stdenv.isDarwin [ "--disable-toolbox-glue" @@ -233,10 +232,7 @@ let strictDeps = true; buildInputs = optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ - [ bzip2 openssl zlib ] - ++ optional (stdenv.hostPlatform.isCygwin || stdenv.hostPlatform.isAarch64) libffi - ++ optional stdenv.hostPlatform.isCygwin expat - ++ [ db gdbm ncurses sqlite readline ] + [ bzip2 openssl zlib libffi expat db gdbm ncurses sqlite readline ] ++ optionals x11Support [ tcl tk libX11 ] ++ optional (stdenv.isDarwin && configd != null) configd; nativeBuildInputs = |