diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2014-07-14 17:04:55 +0200 |
| commit | ff97b7dbe6aef98b105c8af34f19232aa7d49d80 (patch) | |
| tree | b44b52b9a17a84c84d179c1cafd3a3425c62751a /pkgs/applications/editors/vim | |
| parent | 0b82b9532229a28758df482218222d90d910c494 (diff) | |
| parent | b57bc220cc04e3d8f931b604e5acc44544b8c1c0 (diff) | |
| download | nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.gz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.bz2 nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.lz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.xz nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.tar.zst nixpkgs-ff97b7dbe6aef98b105c8af34f19232aa7d49d80.zip | |
Merge remote-tracking branch 'origin/master' into staging
Diffstat (limited to 'pkgs/applications/editors/vim')
| -rw-r--r-- | pkgs/applications/editors/vim/macvim.nix | 8 | ||||
| -rw-r--r-- | pkgs/applications/editors/vim/macvim.patch | 30 |
2 files changed, 34 insertions, 4 deletions
diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix index 8b8f08b6fd7..feafa7b9977 100644 --- a/pkgs/applications/editors/vim/macvim.nix +++ b/pkgs/applications/editors/vim/macvim.nix @@ -6,13 +6,13 @@ let inherit (stdenvAdapters.overrideGCC stdenv gccApple) mkDerivation; in mkDerivation rec { name = "macvim-${version}"; - version = "7.4-73"; + version = "7.4.355"; src = fetchFromGitHub { - owner = "b4winckler"; + owner = "genoma"; repo = "macvim"; - rev = "snapshot-73"; - sha256 = "0zv82y2wz8b482khkgbl08cnxq3pv5bm37c71wgfa0fzy3h12gcj"; + rev = "c18a61f9723565664ffc2eda9179e96c95860e25"; + sha256 = "190bngg8m4bwqcia7w24gn7mmqkhk0mavxy81ziwysam1f652ymf"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch index c721bbe149a..a789b9952d2 100644 --- a/pkgs/applications/editors/vim/macvim.patch +++ b/pkgs/applications/editors/vim/macvim.patch @@ -1,3 +1,33 @@ +diff --git a/src/MacVim/MacVim.xcodeproj/project.pbxproj b/src/MacVim/MacVim.xcodeproj/project.pbxproj +index 1c5ff47..677a2cc 100644 +--- a/src/MacVim/MacVim.xcodeproj/project.pbxproj ++++ b/src/MacVim/MacVim.xcodeproj/project.pbxproj +@@ -437,6 +437,8 @@ + /* Begin PBXProject section */ + 29B97313FDCFA39411CA2CEA /* Project object */ = { + isa = PBXProject; ++ attributes = { ++ }; + buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "MacVim" */; + compatibilityVersion = "Xcode 2.4"; + developmentRegion = English; +@@ -632,6 +634,7 @@ + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = ""; + ONLY_ACTIVE_ARCH = YES; ++ OTHER_LDFLAGS = "-headerpad_max_install_names"; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WARNING_CFLAGS = "-Wall"; +@@ -662,6 +665,7 @@ + INSTALL_PATH = "$(HOME)/Applications"; + MACOSX_DEPLOYMENT_TARGET = ""; + ONLY_ACTIVE_ARCH = YES; ++ OTHER_LDFLAGS = "-headerpad_max_install_names"; + PRODUCT_NAME = MacVim; + VERSIONING_SYSTEM = "apple-generic"; + WRAPPER_EXTENSION = app; + diff --git a/src/vimtutor b/src/vimtutor index 70d9ec7..b565a1a 100755 --- a/src/vimtutor |