Commit ef30dee2 authored by ilkecan's avatar ilkecan Committed by Matthieu Coudron
Browse files

buildVimPlugin: deprecate `rtp` attribute

parent 448bb9bb

pkgs/applications/editors/vim/plugins/build-vim-plugin.nix

+2 −2
Original line number Diff line number Diff line
@@ -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

pkgs/applications/editors/vim/plugins/vim-utils.nix

+2 −2
Original line number Diff line number Diff line
@@ -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()

      '';

pkgs/applications/editors/vim/vimacs.nix

+1 −1
Original line number Diff line number Diff line
@@ -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