diff options
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix index 444d43309511..d57d77351c51 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix @@ -12,6 +12,8 @@ , sqlite , tcl-8_5 , tk-8_5 +, tcl-8_6 +, tk-8_6 , zlib # For the Python package set , packageOverrides ? (self: super: {}) @@ -69,9 +71,13 @@ in with passthru; stdenv.mkDerivation { gdbm ncurses6 sqlite + zlib + ] ++ lib.optionals stdenv.isLinux [ tcl-8_5 tk-8_5 - zlib + ] ++ lib.optionals stdenv.isDarwin [ + tcl-8_6 + tk-8_6 ]; nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; @@ -108,10 +114,19 @@ in with passthru; stdenv.mkDerivation { @rpath/lib${executable}-c.dylib \ $out/lib/lib${executable}-c.dylib \ $out/bin/${executable} + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtcl8.6.dylib \ + ${tcl-8_6}/lib/libtcl8.6.dylib \ + $out/lib_pypy/_tkinter/*.so + install_name_tool \ + -change \ + /opt/homebrew${lib.optionalString stdenv.isx86_64 "_x86_64"}/opt/tcl-tk/lib/libtk8.6.dylib \ + ${tk-8_6}/lib/libtk8.6.dylib \ + $out/lib_pypy/_tkinter/*.so ''; - # Native libraries are not working in darwin - doInstallCheck = !stdenv.isDarwin; + doInstallCheck = true; # Check whether importing of (extension) modules functions installCheckPhase = let |