about summary refs log tree commit diff
path: root/pkgs/development/interpreters/python/pypy
diff options
context:
space:
mode:
authorAnders Kaseorg <andersk@mit.edu>2020-11-17 21:20:02 -0800
committerAnders Kaseorg <andersk@mit.edu>2020-11-18 00:21:41 -0800
commit9e09ad518292b2a522b6ffd38d0fc61333b94be5 (patch)
tree55230b9b530a1c6e1445af1b3915c42895ce7255 /pkgs/development/interpreters/python/pypy
parentb7836e5ca614e6efd1803a4567417830bd58fd6e (diff)
pypy, pypy3: 7.3.1 → 7.3.2
Signed-off-by: Anders Kaseorg <andersk@mit.edu>
Diffstat (limited to 'pkgs/development/interpreters/python/pypy')
-rw-r--r--pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch13
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
index 0b78caf7e075c..15d03830e07eb 100644
--- a/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
+++ b/pkgs/development/interpreters/python/pypy/tk_tcl_paths.patch
@@ -1,13 +1,14 @@
---- pypy-pypy-84a2f3e6a7f8.org/lib_pypy/_tkinter/tklib_build.py	2017-10-03 11:49:20.000000000 +0100
-+++ pypy-pypy-84a2f3e6a7f8/lib_pypy/_tkinter/tklib_build.py	2017-11-21 13:20:51.398607530 +0000
-@@ -17,18 +17,14 @@
+--- a/lib_pypy/_tkinter/tklib_build.py
++++ b/lib_pypy/_tkinter/tklib_build.py
+@@ -17,19 +17,14 @@ elif sys.platform == 'win32':
      incdirs = []
      linklibs = ['tcl85', 'tk85']
      libdirs = []
 -elif sys.platform == 'darwin':
--    incdirs = ['/System/Library/Frameworks/Tk.framework/Versions/Current/Headers/']
--    linklibs = ['tcl', 'tk']
--    libdirs = []
+-    # homebrew
+-    incdirs = ['/usr/local/opt/tcl-tk/include']
+-    linklibs = ['tcl8.6', 'tk8.6']
+-    libdirs = ['/usr/local/opt/tcl-tk/lib']
  else:
      # On some Linux distributions, the tcl and tk libraries are
      # stored in /usr/include, so we must check this case also