git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #136429 from teto/vim-remove-rtpPath

Vim remove share/runtime/NAME prefix from the installed folder

commited77db85ff6a590f3072f32d3d7f7a6d71d46017 authorMatthieu Coudron <teto@users.noreply.github.com> dateSun 12 Sep 2021, 19:58 (5 years ago) parent8b13843354b186
6 files changed+26−19
compare with master
unifiedsplit
pkgs/applications/editors/neovim/tests.nix+7 pkgs/applications/editors/vim/vimacs.nix+1−1 pkgs/misc/vim-plugins/build-vim-plugin.nix+1−1 pkgs/misc/vim-plugins/overrides.nix+9−9 pkgs/misc/vim-plugins/vim-gen-doc-hook.sh−1 pkgs/misc/vim-plugins/vim-utils.nix+8−7
pkgs/applications/editors/neovim/tests.nix+7
@@ -84,6 +84,13 @@ rec {
8484 viAlias = true;
8585 };
8686
87+ nvim_with_plug = neovim.override {
88+ extraName = "-with-plug";
89+ configure.plug.plugins = with pkgs.vimPlugins; [
90+ vim-go
91+ ];
92+ };
93+
8794 # nixpkgs should detect that no wrapping is necessary
8895 nvimShouldntWrap = wrapNeovim2 "-should-not-wrap" nvimAutoDisableWrap;
8996
pkgs/applications/editors/vim/vimacs.nix+1−1
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
1111
1212 buildCommand = ''
1313 mkdir -p "$out"/bin
14− cp "${vimPlugins.vimacs}"/share/vim-plugins/vimacs/bin/vim $out/bin/vimacs
14+ cp "${vimPlugins.vimacs}"/bin/vim $out/bin/vimacs
1515 substituteInPlace "$out"/bin/vimacs \
1616 --replace '-vim}' '-@bin@/bin/vim}' \
1717 --replace '-gvim}' '-@bin@/bin/vim -g}' \
pkgs/misc/vim-plugins/build-vim-plugin.nix+1−1
@@ -19,7 +19,7 @@ rec {
1919 buildPhase ? "",
2020 preInstall ? "",
2121 postInstall ? "",
22− path ? lib.getName name,
22+ path ? ".",
2323 addonInfo ? null,
2424 ...
2525 }:
pkgs/misc/vim-plugins/overrides.nix+9−9
@@ -99,10 +99,10 @@ self: super: {
9999 # The linked ruby code shows generates the required '.clang_complete' for cmake based projects
100100 # https://gist.github.com/Mic92/135e83803ed29162817fce4098dec144
101101 preFixup = ''
102− substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \
102+ substituteInPlace "$out"/plugin/clang_complete.vim \
103103 --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.libclang.lib}/lib/libclang.so'"
104104
105− substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/libclang.py \
105+ substituteInPlace "$out"/plugin/libclang.py \
106106 --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang"
107107 '';
108108 });
@@ -110,7 +110,7 @@ self: super: {
110110 clighter8 = super.clighter8.overrideAttrs (old: {
111111 preFixup = ''
112112 sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \
113− -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
113+ -i "$out"/plugin/clighter8.vim
114114 '';
115115 });
116116
@@ -203,7 +203,7 @@ self: super: {
203203
204204 direnv-vim = super.direnv-vim.overrideAttrs (oa: {
205205 preFixup = oa.preFixup or "" + ''
206− substituteInPlace $out/share/vim-plugins/direnv.vim/autoload/direnv.vim \
206+ substituteInPlace $out/autoload/direnv.vim \
207207 --replace "let s:direnv_cmd = get(g:, 'direnv_cmd', 'direnv')" \
208208 "let s:direnv_cmd = get(g:, 'direnv_cmd', '${lib.getBin direnv}/bin/direnv')"
209209 '';
@@ -354,7 +354,7 @@ self: super: {
354354 propagatedBuildInputs = [ LanguageClient-neovim-bin ];
355355
356356 preFixup = ''
357− substituteInPlace "$out"/share/vim-plugins/LanguageClient-neovim/autoload/LanguageClient.vim \
357+ substituteInPlace "$out"/autoload/LanguageClient.vim \
358358 --replace "let l:path = s:root . '/bin/'" "let l:path = '${LanguageClient-neovim-bin}' . '/bin/'"
359359 '';
360360 };
@@ -387,9 +387,9 @@ self: super: {
387387
388388 minimap-vim = super.minimap-vim.overrideAttrs (old: {
389389 preFixup = ''
390− substituteInPlace $out/share/vim-plugins/minimap.vim/plugin/minimap.vim \
390+ substituteInPlace $out/plugin/minimap.vim \
391391 --replace "code-minimap" "${code-minimap}/bin/code-minimap"
392− substituteInPlace $out/share/vim-plugins/minimap.vim/bin/minimap_generator.sh \
392+ substituteInPlace $out/bin/minimap_generator.sh \
393393 --replace "code-minimap" "${code-minimap}/bin/code-minimap"
394394 '';
395395 });
@@ -691,7 +691,7 @@ self: super: {
691691
692692 vim-dasht = super.vim-dasht.overrideAttrs (old: {
693693 preFixup = ''
694− substituteInPlace $out/share/vim-plugins/vim-dasht/autoload/dasht.vim \
694+ substituteInPlace $out/autoload/dasht.vim \
695695 --replace "['dasht']" "['${dasht}/bin/dasht']"
696696 '';
697697 });
@@ -795,7 +795,7 @@ self: super: {
795795 in
796796 super.vim-markdown-composer.overrideAttrs (oldAttrs: rec {
797797 preFixup = ''
798− substituteInPlace "$out"/share/vim-plugins/vim-markdown-composer/after/ftplugin/markdown/composer.vim \
798+ substituteInPlace "$out"/after/ftplugin/markdown/composer.vim \
799799 --replace "let l:args = [s:plugin_root . '/target/release/markdown-composer']" \
800800 "let l:args = ['${vim-markdown-composer-bin}/bin/markdown-composer']"
801801 '';
pkgs/misc/vim-plugins/vim-gen-doc-hook.sh−1
@@ -7,7 +7,6 @@ vimPluginGenTags() {
77
88 target="$out/@rtpPath@/$pname"
99 mkdir -p $out/@rtpPath@
10− cp -r . $target
1110
1211 # build help tags
1312 if [ -d "$target/doc" ]; then
pkgs/misc/vim-plugins/vim-utils.nix+8−7
@@ -185,7 +185,7 @@ let
185185 else (lib.optional (x ? name) x.name)
186186 ++ (x.names or []);
187187
188− rtpPath = "share/vim-plugins";
188+ rtpPath = ".";
189189
190190 nativeImpl = packages:
191191 (let
@@ -196,13 +196,14 @@ let
196196 ln -sf ${plugin}/${plugin.pname}-${plugin.version}-rocks/${plugin.pname}/${plugin.version}/* $out/pack/${packageName}/${dir}/${plugin.pname}/
197197 '';
198198
199− linkVimlPlugin = pluginPath: packageName: dir:
200− "ln -sf ${pluginPath}/${rtpPath}/* $out/pack/${packageName}/${dir}";
199+ linkVimlPlugin = plugin: packageName: dir: ''
200+ mkdir -p $out/pack/${packageName}/${dir}/${plugin.pname}
201+ ln -sf ${plugin}/${rtpPath}/* $out/pack/${packageName}/${dir}/${plugin.pname}
202+ '';
201203
202− # (builtins.trace pluginPath )
203− link = pluginPath: if hasLuaModule pluginPath
204− then linkLuaPlugin pluginPath
205− else linkVimlPlugin pluginPath;
204+ link = pluginPath: if hasLuaModule pluginPath
205+ then linkLuaPlugin pluginPath
206+ else linkVimlPlugin pluginPath;
206207
207208 packageLinks = (packageName: {start ? [], opt ? []}:
208209 let