From 1d7d0addcc0df4ae50f5d11ece142f33bc241f5e Mon Sep 17 00:00:00 2001
From: "Jason \"Don\" O'Conal" <lovek323@gmail.com>
Date: Sun, 14 Jul 2013 11:24:45 +1000
Subject: [PATCH] vim-plugins: add expression command-t

* also fix build of vim on darwin
---
 pkgs/applications/editors/vim/default.nix |  6 ++--
 pkgs/misc/vim-plugins/default.nix         | 35 ++++++++++++++++++++++-
 pkgs/top-level/all-packages.nix           |  7 ++++-
 3 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix
index ff8da0e09473..a3e40004550b 100644
--- a/pkgs/applications/editors/vim/default.nix
+++ b/pkgs/applications/editors/vim/default.nix
@@ -41,8 +41,10 @@ stdenv.mkDerivation rec {
     sed -i -e 's/as_fn_error.*int32.*/:/' src/auto/configure
   '';
   
-  meta = {
+  meta = with stdenv.lib; {
     description = "The most popular clone of the VI editor";
-    homepage = http://www.vim.org;
+    homepage    = http://www.vim.org;
+    maintainers = with maintainers; [ lovek323 ];
+    platforms   = platforms.unix;
   };
 }
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index 68e968d571e9..e8d9e9a11e4b 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{fetchurl, stdenv, python, cmake, vim}:
+{ fetchurl, stdenv, python, cmake, vim, perl, ruby }:
 
 /*
 About Vim and plugins
@@ -142,6 +142,8 @@ in
       cp -R doc "$out/vim-plugins"
       cp -R plugin "$out/vim-plugins"
       cp -R syntax_checkers "$out/vim-plugins"
+
+      ${vimHelptags "$out/vim-plugins/doc"}
     '';
   };
 
@@ -164,6 +166,35 @@ in
       cp -R ftplugin "$out/vim-plugins"
       cp -R indent "$out/vim-plugins"
       cp -R syntax "$out/vim-plugins"
+
+      ${vimHelptags "$out/vim-plugins/doc"}
+    '';
+  };
+
+  commandT = stdenv.mkDerivation {
+    name = "vim-command-t-1.4";
+
+    src = fetchurl {
+      url    = "https://github.com/wincent/Command-T/archive/1.4.tar.gz";
+      sha256 = "1ka9hwx9n0vj1dd5qsd2l1wq0kriwl76jmmdjzh7zaf0p547v98s";
+    };
+
+    buildInputs = [ perl ruby ];
+
+    buildPhase = ''
+      pushd ruby/command-t
+      ruby extconf.rb
+      make
+      popd
+    '';
+
+    installPhase = ''
+      mkdir -p "$out/vim-plugins"
+      cp -R doc "$out/doc"
+      cp -R plugin "$out/vim-plugins"
+      cp -R ruby "$out/vim-plugins"
+
+      ${vimHelptags "$out/vim-plugins/doc"}
     '';
   };
 
@@ -179,6 +210,8 @@ in
       mkdir -p "$out/vim-plugins"
       cp -R plugin "$out/vim-plugins"
     '';
+
+    postInstall = false;
   };
 }
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a656cdf1c419..3edefd59eedd 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8546,7 +8546,12 @@ let
     flup = pythonPackages.flup;
   };
 
-  vim = callPackage ../applications/editors/vim { };
+  vim = callPackage ../applications/editors/vim {
+    # for Objective-C compilation
+    stdenv = if stdenv.isDarwin
+      then clangStdenv
+      else stdenv;
+  };
 
   vimHugeX = vim_configurable;