diff options
| author | Wink Saville <wink@saville.com> | 2016-09-23 09:13:23 -0700 |
|---|---|---|
| committer | Wink Saville <wink@saville.com> | 2016-09-23 09:13:23 -0700 |
| commit | d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c (patch) | |
| tree | a81e9cdd13cb82125fb931ef7b6b453f295e3160 | |
| parent | 08d7cfa4203dd5adc8b98979ab085a8a100c3f34 (diff) | |
| download | nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.tar nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.tar.gz nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.tar.bz2 nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.tar.lz nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.tar.xz nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.tar.zst nixlib-d81a6e6f9cb7d7a6c82b2ce563dbeb3c0ec0642c.zip | |
Remove python_framework.patch
In the [discussion](https://github.com/NixOS/nixpkgs/pull/18801) of this pull request @LnL7 was unable to complete a darwin build because the python_framework.patch does not apply and suggests it should be removed.
| -rw-r--r-- | pkgs/applications/editors/vim/configurable.nix | 6 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/python_framework.patch | 24 |
2 files changed, 0 insertions, 30 deletions
diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 59c82369d116..4ab0ca3f27c9 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -69,12 +69,6 @@ composableDerivation { prePatch = "cd src"; - # if darwin support is enabled, we want to make sure we're not building with - # OS-installed python framework - patches = stdenv.lib.optionals - (stdenv.isDarwin && (config.vim.darwin or true)) - [ ./python_framework.patch ]; - configureFlags = [ "--enable-gui=${args.gui}" "--with-features=${args.features}" ]; diff --git a/pkgs/applications/editors/vim/python_framework.patch b/pkgs/applications/editors/vim/python_framework.patch deleted file mode 100644 index ba4ddef889f6..000000000000 --- a/pkgs/applications/editors/vim/python_framework.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- a/auto/configure -+++ b/auto/configure -@@ -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 -@@ -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 - - if ${vi_cv_dll_name_python+:} false; then : - $as_echo_n "(cached) " >&6 |