Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 08a0f3fefcb5
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d4d4e58e331d
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Oct 21, 2018

  1. vimPlugins.clang_complete: fix path to libclang.so 

    Same fix as d301d5c.

A traditional backport with `git cherry-pick` is impossible as the
override approach for VIM plugins has significantly changed.
    @Ma27
    Ma27 committed Oct 21, 2018
    Copy the full SHA
    5fa7d74 View commit details

  2. Merge pull request #48779 from Ma27/backport-vim-clang-fix 

    vimPlugins.clang_complete: fix path to libclang.so (backport)
    @Mic92
    Mic92 authored Oct 21, 2018

    Verified

    This commit was signed with the committer’s verified signature. The key has expired.
    marsam Mario Rodas
    GPG key ID: 4C4BEFD7B18DC5E8
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d4d4e58 View commit details
Showing with 2 additions and 2 deletions.
  1. +1 −1 pkgs/misc/vim-plugins/default.nix
  2. +1 −1 pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
2 changes: 1 addition & 1 deletion pkgs/misc/vim-plugins/default.nix
View file
Original file line number Diff line number Diff line change
@@ -439,7 +439,7 @@ self = rec {
# $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; 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'"
'';
};

2 changes: 1 addition & 1 deletion pkgs/misc/vim-plugins/vim2nix/additional-nix-code/clang_complete
View file
Original file line number Diff line number Diff line change
@@ -7,5 +7,5 @@
# $ eval echo $(nix-instantiate --eval --expr 'with (import <nixpkgs>) {}; 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'"
'';