Make configurable Vim build with most options

svn path=/nixpkgs/trunk/; revision=22924

2 files changed, 11 insertions, 7 deletions

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index bb51d23790b1..a1a9b5e11354 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -14,7 +14,8 @@ composableDerivation {} {
     configureFlags = ["--enable-gui=auto" "--with-features=${args.features}"];
 
     buildNativeInputs = [ncurses pkgconfig]
-      ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu ];
+      ++ [ gtk libX11 libXext libSM libXpm libXt libXaw libXau libXmu glib 
+           libICE ];
 
     # most interpreters aren't tested yet.. (see python for example how to do it)
     flags = {
@@ -30,17 +31,18 @@ composableDerivation {} {
       // edf { name = "python"; feat = "pythoninterp"; enable = { buildNativeInputs = [python]; }; } #Include Python interpreter.
       // edf { name = "tcl"; enable = { buildNativeInputs = [tcl]; }; } #Include Tcl interpreter.
       // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildNativeInputs = [ruby]; };} #Include Ruby interpreter.
+      // edf { name = "lua" ; feat = "luainterp"; enable = { buildNativeInputs = [lua]; configureFlags = ["--with-lua-prefix=${args.lua}"];};}
       // edf { name = "cscope"; } #Include cscope interface.
       // edf { name = "workshop"; } #Include Sun Visual Workshop support.
       // edf { name = "netbeans"; } #Disable NetBeans integration support.
-      // edf { name = "sniff"; } #Include Sniff interface.
+      // edf { name = "sniff"; feat = "sniff" ; } #Include Sniff interface.
       // edf { name = "multibyte"; } #Include multibyte editing support.
-      // edf { name = "hangulinput"; } #Include Hangul input support.
-      # // edf { name = "xim"; enable = { buildNativeInputs = [xim]; }; } #Include XIM input support.
+      // edf { name = "hangulinput"; feat = "hangulinput" ;} #Include Hangul input support.
+      // edf { name = "xim"; } #Include XIM input support.
       // edf { name = "fontset"; } #Include X fontset output support.
       // edf { name = "acl"; } #Don't check for ACL support.
       // edf { name = "gpm"; } #Don't use gpm (Linux mouse daemon).
-      // edf { name = "nls"; } #Don't support NLS (gettext()).
+      // edf { name = "nls"; enable = {buildNativeInputs = [gettext];}; } #Don't support NLS (gettext()).
       ;
 
   cfg = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3e39a1c1abea..58be4e57976f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6155,9 +6155,9 @@ let
   vimHugeX = vim_configurable;
 
   vim_configurable = import ../applications/editors/vim/configurable.nix {
-    inherit fetchurl stdenv ncurses pkgconfig composableDerivation lib;
+    inherit fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib;
     inherit (xlibs) libX11 libXext libSM libXpm
-        libXt libXaw libXau libXmu;
+        libXt libXaw libXau libXmu libICE;
     inherit (gtkLibs) glib gtk;
     features = "huge"; # one of  tiny, small, normal, big or huge
     # optional features by passing
@@ -6165,6 +6165,8 @@ let
     # TODO mzschemeinterp perlinterp
     inherit python perl tcl ruby /*x11*/;
 
+    lua = lua5;
+
     # optional features by flags
     flags = [ "X11" ]; # only flag "X11" by now
   };