diff options
author | Daiderd Jordan <daiderd@gmail.com> | 2017-10-08 12:58:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-08 12:58:37 +0200 |
commit | 64a9483444f2c17b08fb0f9fdf1685a776974b22 (patch) | |
tree | 9816343c67ea0fd37983dc28188fb04c8b29577b | |
parent | 3144832556629dcad7c6b1b4f8044039e81bd27f (diff) | |
parent | acf0ee69ba8a4a4713b085e99fd7ddaf0daccd4b (diff) | |
download | nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.tar nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.tar.gz nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.tar.bz2 nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.tar.lz nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.tar.xz nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.tar.zst nixlib-64a9483444f2c17b08fb0f9fdf1685a776974b22.zip |
Merge pull request #29871 from Ma27/vim-utils/override-capability
vim-plugins: add `overrideAttrs` support for `buildVimPluginFrom2Nix`
-rw-r--r-- | pkgs/misc/vim-plugins/vim-utils.nix | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix index b659266ace7f..23749fd4ce60 100644 --- a/pkgs/misc/vim-plugins/vim-utils.nix +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -373,8 +373,10 @@ rec { } ''; - addRtp = path: derivation: - derivation // { rtp = "${derivation}/${path}"; }; + addRtp = path: attrs: derivation: + derivation // { rtp = "${derivation}/${path}"; } // { + overrideAttrs = f: buildVimPlugin (attrs // f attrs); + }; buildVimPlugin = a@{ name, @@ -389,7 +391,7 @@ rec { addonInfo ? null, ... }: - addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { + addRtp "${rtpPath}/${path}" a (stdenv.mkDerivation (a // { name = namePrefix + name; inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; |