From fd948733a0b49fc0ba9fdd12c212fe2eb9345619 Mon Sep 17 00:00:00 2001 From: Marc Weber Date: Thu, 12 Feb 2009 20:27:54 +0000 Subject: [PATCH] fix perl, ruby, tcl support in vim_configurable svn path=/nixpkgs/trunk/; revision=14052 --- pkgs/applications/editors/vim/configurable.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix index 0eac7ea5979f..abe1a403e762 100644 --- a/pkgs/applications/editors/vim/configurable.nix +++ b/pkgs/applications/editors/vim/configurable.nix @@ -23,10 +23,10 @@ composableDerivation { // edf { name = "xsmp"; } #Disable XSMP session management // edf { name = "xsmp_interact"; } #Disable XSMP interaction // edf { name = "mzscheme"; } #Include MzScheme interpreter. - // edf { name = "perl"; } #Include Perl interpreter. + // edf { name = "perl"; feat = "perlinterp"; enable = { buildInputs = [perl]; };} #Include Perl interpreter. // edf { name = "python"; feat = "pythoninterp"; enable = { buildInputs = [python]; }; } #Include Python interpreter. - // edf { name = "tcl"; } #Include Tcl interpreter. - // edf { name = "ruby"; } #Include Ruby interpreter. + // edf { name = "tcl"; enable = { buildInputs = [tcl]; }; } #Include Tcl interpreter. + // edf { name = "ruby"; feat = "rubyinterp"; enable = { buildInputs = [ruby]; };} #Include Ruby interpreter. // edf { name = "cscope"; } #Include cscope interface. // edf { name = "workshop"; } #Include Sun Visual Workshop support. // edf { name = "netbeans"; } #Disable NetBeans integration support. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6ea2722311d4..5e982cd8a6bc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8559,7 +8559,7 @@ let # optional features by passing # python # TODO mzschemeinterp perlinterp - inherit python /*x11*/; + inherit python perl tcl ruby /*x11*/; # optional features by flags flags = [ "X11" ]; # only flag "X11" by now