Merge pull request #34703 from Ma27/make-overriding-vim-configurable-easier

vim_configurable: enable overrides
This commit is contained in:
Jörg Thalheim 2018-02-09 08:15:27 +00:00 committed by GitHub
commit 76a08d4a83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -325,11 +325,14 @@ rec {
# add a customize option to a vim derivation # add a customize option to a vim derivation
makeCustomizable = vim: vim // { makeCustomizable = vim: vim // {
customize = {name, vimrcConfig}: vimWithRC { customize = { name, vimrcConfig }: vimWithRC {
vimExecutable = "${vim}/bin/vim"; vimExecutable = "${vim}/bin/vim";
inherit name; inherit name;
vimrcFile = vimrcFile vimrcConfig; vimrcFile = vimrcFile vimrcConfig;
}; };
override = f: makeCustomizable (vim.override f);
overrideAttrs = f: makeCustomizable (vim.overrideAttrs f);
}; };
pluginnames2Nix = {name, namefiles} : vim_configurable.customize { pluginnames2Nix = {name, namefiles} : vim_configurable.customize {