diff options
Diffstat (limited to 'pkgs/applications/editors')
-rw-r--r-- | pkgs/applications/editors/vim/plugins/build-vim-plugin.nix | 79 | ||||
-rw-r--r-- | pkgs/applications/editors/vim/plugins/vim-utils.nix | 3 |
2 files changed, 40 insertions, 42 deletions
diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix index 42eacb29ca5e1..20641908115c2 100644 --- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix +++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix @@ -1,9 +1,6 @@ -{ lib, stdenv +{ lib +, stdenv , rtpPath -, vim -, vimCommandCheckHook -, vimGenDocHook -, neovimRequireCheckHook , toVimPlugin }: @@ -14,44 +11,46 @@ rec { overrideAttrs = f: addRtp (drv.overrideAttrs f); }; - buildVimPlugin = attrs@{ - name ? "${attrs.pname}-${attrs.version}", - namePrefix ? "vimplugin-", - src, - unpackPhase ? "", - configurePhase ? "", - buildPhase ? "", - preInstall ? "", - postInstall ? "", - path ? ".", - addonInfo ? null, - meta ? { }, - ... - }: - let drv = stdenv.mkDerivation (attrs // { - name = namePrefix + name; - - inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; - - installPhase = '' - runHook preInstall - - target=$out/${rtpPath}/${path} - mkdir -p $out/${rtpPath} - cp -r . $target - - runHook postInstall - ''; - - meta = { - platforms = lib.platforms.all; - } // meta; - }); - in addRtp (toVimPlugin drv); + buildVimPlugin = + { name ? "${attrs.pname}-${attrs.version}" + , namePrefix ? "vimplugin-" + , src + , unpackPhase ? "" + , configurePhase ? "" + , buildPhase ? "" + , preInstall ? "" + , postInstall ? "" + , path ? "." + , addonInfo ? null + , meta ? { } + , ... + }@attrs: + let + drv = stdenv.mkDerivation (attrs // { + name = namePrefix + name; + + inherit unpackPhase configurePhase buildPhase addonInfo preInstall postInstall; + + installPhase = '' + runHook preInstall + + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + + runHook postInstall + ''; + + meta = { + platforms = lib.platforms.all; + } // meta; + }); + in + addRtp (toVimPlugin drv); buildVimPluginFrom2Nix = attrs: buildVimPlugin ({ # vim plugins may override this buildPhase = ":"; - configurePhase =":"; + configurePhase = ":"; } // attrs); } diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 6607ff2b8c433..4235aa5e929e0 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -391,8 +391,7 @@ rec { } ./neovim-require-check-hook.sh) {}; inherit (import ./build-vim-plugin.nix { - inherit lib stdenv rtpPath vim vimGenDocHook - toVimPlugin vimCommandCheckHook neovimRequireCheckHook; + inherit lib stdenv rtpPath toVimPlugin; }) buildVimPlugin buildVimPluginFrom2Nix; |