vimHugeX: also add wrapper for system-wide vimrc

This commit is contained in:
Ricardo M. Correia 2013-08-29 21:27:48 +00:00
parent 0b66e7f5be
commit 05a2b88df7
2 changed files with 12 additions and 6 deletions

View File

@ -2,10 +2,12 @@
let
vimrcfile = writeText "vimrc" (if vimrc == null then "" else vimrc);
vimrcfile = writeText "vimrc" vimrc;
p = builtins.parseDrvName vim.name;
in stdenv.mkDerivation rec {
name = "vimwrapper-${vim.version}";
name = "${p.name}-with-vimrc-${p.version}";
buildInputs = [ makeWrapper vim vimrcfile ];

View File

@ -9092,13 +9092,12 @@ let
else stdenv;
};
vimwrapper = callPackage ../applications/editors/vim/wrapper.nix {
inherit vim;
vimrc = config.vim.vimrc or null;
};
vimWrapper = wrapVim vim;
vimHugeX = vim_configurable;
vimHugeXWrapper = wrapVim vimHugeX;
vim_configurable = callPackage ../applications/editors/vim/configurable.nix {
inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext
composableDerivation lib config glib gtk python perl tcl ruby;
@ -9131,6 +9130,11 @@ let
flags = [ "python" "X11" ]; # only flag "X11" by now
});
wrapVim = vim: import ../applications/editors/vim/wrapper.nix {
inherit stdenv makeWrapper writeText vim;
vimrc = config.vim.vimrc or "";
};
virtviewer = callPackage ../applications/virtualization/virt-viewer {};
virtmanager = callPackage ../applications/virtualization/virt-manager {
inherit (gnome) gnome_python;