From acf0ee69ba8a4a4713b085e99fd7ddaf0daccd4b Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Wed, 27 Sep 2017 18:24:29 +0200 Subject: [PATCH] vim-plugins: add `overrideAttrs` support for `buildVimPluginFrom2Nix` --- pkgs/misc/vim-plugins/vim-utils.nix | 8 +++++--- 1 file 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;