diff options
Diffstat (limited to 'pkgs/development/interpreters/python/pypy/prebuilt.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/prebuilt.nix | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index 0ebd3364834..1522047a380 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -8,10 +8,9 @@ , zlib , openssl_1_0_2 , expat -, libffi -, ncurses -, tcl -, tk +, ncurses6 +, tcl-8_5 +, tk-8_5 # For the Python package set , packageOverrides ? (self: super: {}) , sourceVersion @@ -46,10 +45,9 @@ let zlib openssl_1_0_2 expat - libffi - ncurses - tcl - tk + ncurses6 + tcl-8_5 + tk-8_5 ]; in with passthru; stdenv.mkDerivation { @@ -66,6 +64,7 @@ in with passthru; stdenv.mkDerivation { mkdir -p $out/lib echo "Moving files to $out" mv -t $out bin include lib-python lib_pypy site-packages + mv lib/libffi.so.6* $out/lib/ mv $out/bin/libpypy*-c.so $out/lib/ @@ -78,8 +77,8 @@ in with passthru; stdenv.mkDerivation { $out/bin/pypy* pushd $out - find {lib,lib_pypy*} -name "*.so" -exec patchelf --replace-needed "libbz2.so.1.0" "libbz2.so.1" {} \; - find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps} {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --remove-needed libncursesw.so.6 --replace-needed libtinfow.so.6 libncursesw.so.6 {} \; + find {lib,lib_pypy*} -name "*.so" -exec patchelf --set-rpath ${stdenv.lib.makeLibraryPath deps}:$out/lib {} \; echo "Removing bytecode" find . -name "__pycache__" -type d -depth -exec rm -rf {} \; |