diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2008-01-12 00:22:52 +0000 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2008-01-12 00:22:52 +0000 |
| commit | ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d (patch) | |
| tree | 81c73443e2447b3150cd1d1259cc7e2efed5bf6d | |
| parent | 5116a523a9cedf5e2848ca4602d8f79866085e80 (diff) | |
| download | nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.tar nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.tar.gz nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.tar.bz2 nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.tar.lz nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.tar.xz nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.tar.zst nixpkgs-ee17a4e1534619d50f9f1504a6abf2cd53cd0b9d.zip | |
Added python/tcl support to Vim; also xim - needed for deadkeys.
svn path=/nixpkgs/trunk/; revision=10120
| -rw-r--r-- | pkgs/applications/editors/vim/default.nix | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
2 files changed, 19 insertions, 4 deletions
diff --git a/pkgs/applications/editors/vim/default.nix b/pkgs/applications/editors/vim/default.nix index a08808a4756..5a524d6dabe 100644 --- a/pkgs/applications/editors/vim/default.nix +++ b/pkgs/applications/editors/vim/default.nix @@ -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 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8748aa22528..79fd115a120 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { |