diff options
| author | Brandon Martin <zmbmartin@gmail.com> | 2015-09-03 15:40:47 -0600 |
|---|---|---|
| committer | Brandon Martin <zmbmartin@gmail.com> | 2015-09-29 06:44:17 -0600 |
| commit | 265e6751528616a386e6f925c84d1d2d1d3acc3c (patch) | |
| tree | 4a1a3435bc6d1a9e49b1b295a102a22486e67bd2 /pkgs/applications/editors/vim | |
| parent | 94eac9ccbdfe08c9cc02c4b8f6a07be757715a77 (diff) | |
| download | nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.tar nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.tar.gz nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.tar.bz2 nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.tar.lz nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.tar.xz nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.tar.zst nixlib-265e6751528616a386e6f925c84d1d2d1d3acc3c.zip | |
vim: update python_framework.patch for darwin
Diffstat (limited to 'pkgs/applications/editors/vim')
| -rw-r--r-- | pkgs/applications/editors/vim/python_framework.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch index b7c7cee6cd93..ba4ddef889f6 100644 --- a/pkgs/applications/editors/vim/python_framework.patch +++ b/pkgs/applications/editors/vim/python_framework.patch @@ -1,23 +1,24 @@ -diff --git a/src/auto/configure b/src/auto/configure -index a9755a0..4a0e2a4 100755 --- a/auto/configure +++ b/auto/configure -@@ -5638,10 +5638,6 @@ __: +@@ -5895,13 +5895,6 @@ eof eval "`cd ${PYTHON_CONFDIR} && make -f "${tmp_mkf}" __ | sed '/ directory /d'`" rm -f -- "${tmp_mkf}" - if test "x$MACOSX" = "xyes" && ${vi_cv_path_python} -c \ - "import sys; sys.exit(${vi_cv_var_python_version} < 2.3)"; then - vi_cv_path_python_plibs="-framework Python" +- if test "x${vi_cv_path_python}" != "x/usr/bin/python" && test -n "${python_PYTHONFRAMEWORKPREFIX}"; then +- vi_cv_path_python_plibs="-F${python_PYTHONFRAMEWORKPREFIX} -framework Python" +- fi - else if test "${vi_cv_var_python_version}" = "1.4"; then vi_cv_path_python_plibs="${PYTHON_CONFDIR}/libModules.a ${PYTHON_CONFDIR}/libPython.a ${PYTHON_CONFDIR}/libObjects.a ${PYTHON_CONFDIR}/libParser.a" else -@@ -5649,7 +5645,6 @@ eof - fi +@@ -5921,7 +5914,6 @@ vi_cv_path_python_plibs="${vi_cv_path_python_plibs} ${python_BASEMODLIBS} ${python_LIBS} ${python_SYSLIBS} ${python_LINKFORSHARED}" vi_cv_path_python_plibs=`echo $vi_cv_path_python_plibs | sed s/-ltermcap//` -- fi - fi +-fi + if ${vi_cv_dll_name_python+:} false; then : + $as_echo_n "(cached) " >&6 |