Making vim some configurable options go through getConfig.

svn path=/nixpkgs/branches/stdenv-updates/; revision=24033
This commit is contained in:
Lluís Batlle i Rossell 2010-10-03 09:18:14 +00:00
parent 6923539d84
commit bc92057a17
2 changed files with 10 additions and 3 deletions

View File

@ -46,8 +46,14 @@ composableDerivation {} {
; ;
cfg = { cfg = {
pythonSupport = true; pythonSupport = getConfig [ "vim" "python" ] true;
ftNixSupport = true; # add .nix filetype detection and minimal syntax highlighting support darwinSupport = getConfig [ "vim" "darwin" ] false;
nlsSupport = getConfig [ "vim" "nls" ] false;
tclSupport = getConfig [ "vim" "tcl" ] false;
multibyteSupport = getConfig [ "vim" "multibyte" ] false;
cscopeSupport = getConfig [ "vim" "cscope" ] false;
# add .nix filetype detection and minimal syntax highlighting support
ftNixSupport = getConfig [ "vim" "ftNix" ] true;
}; };
#--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon #--enable-gui=OPTS X11 GUI default=auto OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/photon/carbon

View File

@ -6196,7 +6196,8 @@ let
vimHugeX = vim_configurable; vimHugeX = vim_configurable;
vim_configurable = import ../applications/editors/vim/configurable.nix { vim_configurable = import ../applications/editors/vim/configurable.nix {
inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib; inherit (pkgs) fetchurl stdenv ncurses pkgconfig gettext composableDerivation lib
getConfig;
inherit (pkgs.xlibs) libX11 libXext libSM libXpm inherit (pkgs.xlibs) libX11 libXext libSM libXpm
libXt libXaw libXau libXmu libICE; libXt libXaw libXau libXmu libICE;
inherit (pkgs.gtkLibs) glib gtk; inherit (pkgs.gtkLibs) glib gtk;