diff options
| author | Lily Ballard <lily@sb.org> | 2019-09-11 20:13:36 -0700 |
|---|---|---|
| committer | Lily Ballard <lily@sb.org> | 2019-09-11 20:13:36 -0700 |
| commit | 4563496375f2988578264b72c079da6999002e9a (patch) | |
| tree | ebd95cde7090c6cea96f3fd625e74c9444e11b1c /pkgs/applications/editors/vim | |
| parent | bcaa3e702f099d5dfc0b04f8b4478119b4549c29 (diff) | |
macvim: fix compatibility with Xcode 11
This fixes several Xcode 11 incompatibilities with MacVim, including an
issue where it wasn't inheriting the deployment target correctly to
begin with.
Diffstat (limited to 'pkgs/applications/editors/vim')
| -rw-r--r-- | pkgs/applications/editors/vim/macvim.nix | 3 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/macvim.patch | 27 |
2 files changed, 30 insertions, 0 deletions
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 6081bbc8b0ca..7c89d07a7ecc 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -102,6 +102,9 @@ stdenv.mkDerivation { substituteInPlace src/auto/config.mk --replace "PERL_CFLAGS =" "PERL_CFLAGS = -I${darwin.libutil}/include" substituteInPlace src/MacVim/vimrc --subst-var-by CSCOPE ${cscope}/bin/cscope + + # Work around weird code-signing issue + substituteInPlace src/auto/config.mk --replace "XCODEFLAGS''\t=" "XCODEFLAGS''\t= CODE_SIGN_IDENTITY=" ''; postInstall = '' diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index 8cb96a9ebbad..fd02e1199024 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -18,6 +18,21 @@ index e519018de..556a4127d 100644 PRODUCT_BUNDLE_IDENTIFIER = org.vim.MacVim; PRODUCT_NAME = MacVim; VERSIONING_SYSTEM = "apple-generic"; +diff --git a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m +index 6f1a06e46..a12e2cea4 100644 +--- a/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m ++++ b/src/MacVim/PSMTabBarControl/source/PSMTabBarCell.m +@@ -13,7 +13,9 @@ + #import "PSMTabDragAssistant.h" + + +-@implementation PSMTabBarCell ++@implementation PSMTabBarCell { ++ id _controlView; ++} + + #pragma mark - + #pragma mark Creation/Destruction diff --git a/src/MacVim/vimrc b/src/MacVim/vimrc index 23a06bf37..dfb10fe94 100644 --- a/src/MacVim/vimrc @@ -77,6 +92,18 @@ diff --git a/src/auto/configure b/src/auto/configure index 9e6a82f4a..3c6d1a89b 100755 --- a/src/auto/configure +++ b/src/auto/configure +@@ -4705,10 +4705,8 @@ fi + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + else +- if test -z "$MACOSX_DEPLOYMENT_TARGET"; then +- macosx_deployment_target=`/usr/bin/sw_vers -productVersion|/usr/bin/sed -e 's/^\([0-9]*\.[0-9]*\).*/\1/'` ++ macosx_deployment_target=${MACOSX_DEPLOYMENT_TARGET:-10.12} + XCODEFLAGS="$XCODEFLAGS MACOSX_DEPLOYMENT_TARGET=$macosx_deployment_target" +- fi + fi + + @@ -5829,10 +5829,7 @@ $as_echo "not found" >&6; } for path in "${vi_cv_path_mzscheme_pfx}/lib" "${SCHEME_LIB}"; do |