From ef30dee2d6e0317bbdca083ffc2587e4f0895711 Mon Sep 17 00:00:00 2001
From: ilkecan <ilkecan@protonmail.com>
Date: Thu, 29 Sep 2022 16:31:05 +0000
Subject: [PATCH] buildVimPlugin: deprecate `rtp` attribute

---
 pkgs/applications/editors/vim/plugins/build-vim-plugin.nix | 4 ++--
 pkgs/applications/editors/vim/plugins/vim-utils.nix        | 4 ++--
 pkgs/applications/editors/vim/vimacs.nix                   | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
index bf54e8a5e0ac..66234c2c198e 100644
--- a/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
+++ b/pkgs/applications/editors/vim/plugins/build-vim-plugin.nix
@@ -10,7 +10,7 @@
 rec {
   addRtp = drv:
     drv // {
-      rtp = "${drv}";
+      rtp = lib.warn "`rtp` attribute is deprecated, use `outPath` instead." drv.outPath;
       overrideAttrs = f: addRtp (drv.overrideAttrs f);
     };
 
@@ -42,7 +42,7 @@ rec {
         runHook postInstall
       '';
     });
-    in addRtp drv;
+    in addRtp (toVimPlugin drv);
 
   buildVimPluginFrom2Nix = attrs: buildVimPlugin ({
     # vim plugins may override this
diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix
index 2e482cdf7df5..09c5527cd0ec 100644
--- a/pkgs/applications/editors/vim/plugins/vim-utils.nix
+++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix
@@ -243,10 +243,10 @@ let
       */
       plugImpl =
       ''
-        source ${vimPlugins.vim-plug.rtp}/plug.vim
+        source ${vimPlugins.vim-plug}/plug.vim
         silent! call plug#begin('/dev/null')
 
-        '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg.rtp}'") plug.plugins) + ''
+        '' + (lib.concatMapStringsSep "\n" (pkg: "Plug '${pkg}'") plug.plugins) + ''
 
         call plug#end()
       '';
diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix
index 6eb995f86e06..f8a087cbe6ee 100644
--- a/pkgs/applications/editors/vim/vimacs.nix
+++ b/pkgs/applications/editors/vim/vimacs.nix
@@ -17,7 +17,7 @@ stdenv.mkDerivation rec {
       --replace '-gvim}' '-@bin@/bin/vim -g}' \
       --replace '--cmd "let g:VM_Enabled = 1"' \
                 '--cmd "let g:VM_Enabled = 1" --cmd "set rtp^=@rtp@" ${vimacsExtraArgs}' \
-      --replace @rtp@ ${vimPlugins.vimacs.rtp} \
+      --replace @rtp@ ${vimPlugins.vimacs} \
       --replace @bin@ ${vimPackage}
     for prog in vm gvm gvimacs vmdiff vimacsdiff
     do