public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added python/tcl support to Vim; also xim - needed for deadkeys. 

svn path=/nixpkgs/trunk/; revision=10120
This commit is contained in:
Michael Raskin 2008-01-12 00:22:52 +00:00
parent 5116a523a9
commit ee17a4e153
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/applications/editors/vim/default.nix
View File

@ -9,17 +9,28 @@ let
["athenaGUI" "libXau" "libXt" "libXaw" "libXpm" "libXext" "x11Support"] ["athenaGUI" "libXau" "libXt" "libXaw" "libXpm" "libXext" "x11Support"]
["x11Support" "libX11"] ["x11Support" "libX11"]
["hugeFeatures"] ["hugeFeatures"]
["pythonSupport" "python"]
["perlSupport" "perl"]
["tclSupport" "tcl"]
["true" "ncurses"] ["true" "ncurses"]
["false" "libSM"] ["false" "libSM"]
]; ];
nameSuffixes = [ nameSuffixes = [
"hugeFeatures" "-huge" "hugeFeatures" "-huge"
"x11Support" "-X11" "x11Support" "-X11"
"pythonSupport" "-python"
"perlSupport" "-perl"
"tclSupport" "-tcl"
"ximSupport" "-xim"
]; ];
configFlags = [ configFlags = [
"true" " --disable-xim " "true" " "
"x11Support" " --enable-gui=auto " "x11Support" " --enable-gui=auto "
"hugeFeatures" "--with-features=huge --enable-cscope --enable-multibyte --enable-xsmp" "hugeFeatures" "--with-features=huge --enable-cscope --enable-multibyte --enable-xsmp "
"pythonSupport" " --enable-pythoninterp "
"perlSupport" " --enable-perlinterp "
"tclSupport" " --enable-tclinterp "
"ximSupport" " --enable-xim "
]; ];
buildInputsNames = args.lib.filter (x: (null!=getVal x)) buildInputsNames = args.lib.filter (x: (null!=getVal x))
(args.lib.uniqList {inputList = (args.lib.uniqList {inputList =

8
pkgs/top-level/all-packages.nix
View File

@ -4538,11 +4538,15 @@ rec {
})); }));
vimHugeX = import ../applications/editors/vim { vimHugeX = import ../applications/editors/vim {
inherit fetchurl stdenv lib ncurses pkgconfig; inherit fetchurl stdenv lib ncurses pkgconfig
perl python tcl;
inherit (xlibs) libX11 libXext libSM libXpm inherit (xlibs) libX11 libXext libSM libXpm
libXt libXaw libXau; libXt libXaw libXau;
inherit (gtkLibs) glib gtk; inherit (gtkLibs) glib gtk;
flags = ["hugeFeatures" "gtkGUI" "x11Support"];
# Looks like python and perl can conflict
flags = ["hugeFeatures" "gtkGUI" "x11Support"
/*"perlSupport"*/ "pythonSupport" "tclSupport"];
}; };
vim_configurable = import ../applications/editors/vim/configurable.nix { vim_configurable = import ../applications/editors/vim/configurable.nix {