diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 84af77bade9e7..5f8d80037c9d4 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -87,6 +87,9 @@ in with passthru; stdenv.mkDerivation rec { src = ./sqlite_paths.patch; inherit (sqlite) out dev; }) + ] ++ lib.optionals isPy3k [ + # add missing LDCXXSHARED to sysconfig.get_config_vars() to prevent type errors when compiling eg. Pillow + ./sysconfig-config-vars.patch ]; postPatch = '' diff --git a/pkgs/development/interpreters/python/pypy/sysconfig-config-vars.patch b/pkgs/development/interpreters/python/pypy/sysconfig-config-vars.patch new file mode 100644 index 0000000000000..bd8ab1c25efe7 --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/sysconfig-config-vars.patch @@ -0,0 +1,12 @@ +diff --git a/lib_pypy/_sysconfigdata.py b/lib_pypy/_sysconfigdata.py +index d784211..5cc4d66 100644 +--- a/lib_pypy/_sysconfigdata.py ++++ b/lib_pypy/_sysconfigdata.py +@@ -26,6 +26,7 @@ + 'CCSHARED': "-fPIC", + 'LDFLAGS': "-Wl,-Bsymbolic-functions", + 'LDSHARED': "cc -pthread -shared -Wl,-Bsymbolic-functions", ++ 'LDCXXSHARED': "c++ -shared", + 'EXT_SUFFIX': so_ext, + 'SHLIB_SUFFIX': ".so", + 'AR': "ar",