Merge pull request #747 from lovek323/vim-plugins-command-t

vim-plugins: add expression command-t
NixOS · Jul 15, 2013 · ac1803f · ac1803f
2 parents 9fe9527 + 1d7d0ad
commit ac1803f
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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;