mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-17 07:13:23 +01:00
Added python/tcl support to Vim; also xim - needed for deadkeys.
svn path=/nixpkgs/trunk/; revision=10120
This commit is contained in:
parent
5116a523a9
commit
ee17a4e153
2 changed files with 19 additions and 4 deletions
|
@ -9,17 +9,28 @@ let
|
|||
["athenaGUI" "libXau" "libXt" "libXaw" "libXpm" "libXext" "x11Support"]
|
||||
["x11Support" "libX11"]
|
||||
["hugeFeatures"]
|
||||
["pythonSupport" "python"]
|
||||
["perlSupport" "perl"]
|
||||
["tclSupport" "tcl"]
|
||||
["true" "ncurses"]
|
||||
["false" "libSM"]
|
||||
];
|
||||
nameSuffixes = [
|
||||
"hugeFeatures" "-huge"
|
||||
"x11Support" "-X11"
|
||||
"pythonSupport" "-python"
|
||||
"perlSupport" "-perl"
|
||||
"tclSupport" "-tcl"
|
||||
"ximSupport" "-xim"
|
||||
];
|
||||
configFlags = [
|
||||
"true" " --disable-xim "
|
||||
"true" " "
|
||||
"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))
|
||||
(args.lib.uniqList {inputList =
|
||||
|
|
|
@ -4538,11 +4538,15 @@ rec {
|
|||
}));
|
||||
|
||||
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
|
||||
libXt libXaw libXau;
|
||||
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 {
|
||||
|
|
Loading…
Reference in a new issue