diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-09-26 22:22:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 22:22:46 +0100 |
| commit | 05a92768f27da5c66dd6ab8239df5c758921516f (patch) | |
| tree | 58322d74ae1994921380bbfc6d3039d71803b629 /pkgs/applications/editors | |
| parent | 28af6ac647861bc7ac5968029f89eec2a01bbce7 (diff) | |
| parent | 4563496375f2988578264b72c079da6999002e9a (diff) | |
| download | nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.tar nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.tar.gz nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.tar.bz2 nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.tar.lz nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.tar.xz nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.tar.zst nixlib-05a92768f27da5c66dd6ab8239df5c758921516f.zip | |
Merge pull request #68534 from lilyball/macvim-xcode-11-fix
macvim: fix compatibility with Xcode 11
Diffstat (limited to 'pkgs/applications/editors')
| -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 3df964361cc8..8406dd60b895 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -106,6 +106,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 |