From 5fa7d74d8708f353e7b3f3609d93b0d93bcb93de Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sun, 21 Oct 2018 15:12:20 +0200 Subject: [PATCH] vimPlugins.clang_complete: fix path to libclang.so Same fix as d301d5cb74069a8b3bad22cd3966d8205c5a2aed. A traditional backport with `git cherry-pick` is impossible as the override approach for VIM plugins has significantly changed. --- pkgs/misc/vim-plugins/default.nix | 2 +- .../misc/vim-plugins/vim2nix/additional-nix-code/clang_complete | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index d251b2da45c6..efd8f8f541af 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -439,7 +439,7 @@ self = rec { # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" ''; }; diff --git a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete index ed88e08742ed..f1d48c4a04f9 100644 --- a/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete +++ b/pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete @@ -7,5 +7,5 @@ # $ eval echo $(nix-instantiate --eval --expr 'with (import ) {}; clang.default_cxx_stdlib_compile') preFixup = '' substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ - --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc}/lib/libclang.so'" + --replace "let g:clang_library_path = '' + "''" + ''" "let g:clang_library_path='${llvmPackages.clang.cc.lib}/lib/libclang.so'" '';