diff options
| author | Renaud <c0bw3b@users.noreply.github.com> | 2018-11-25 15:38:59 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-25 15:38:59 +0100 |
| commit | 18eb9e27a3530da8cce859091b64dbd242ded9d9 (patch) | |
| tree | b7d98dba3204e783660d0bd97a8c6024e67a9c73 /pkgs/misc | |
| parent | 017bade3ebd000901b85015c6342f304e99f2446 (diff) | |
| parent | 41f0e933fdb4116d799f1fc26d3c9b4fdef9f3d1 (diff) | |
| download | nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.tar nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.tar.gz nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.tar.bz2 nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.tar.lz nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.tar.xz nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.tar.zst nixlib-18eb9e27a3530da8cce859091b64dbd242ded9d9.zip | |
Merge pull request #47171 from pschuprikov/vim-clang-fix
vim plugins: fix for multiple clang outputs, use clang 6.0
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 4cde30556a33..f5053c2ec6e8 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -19,6 +19,7 @@ let overrides = callPackage ./overrides.nix { inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit buildVimPluginFrom2Nix; + inherit llvmPackages; }; overriden = generated // (overrides generated); diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index bc4f0faefb40..e7d95fb50b57 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -101,12 +101,15 @@ with generated; 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}/lib/libclang.so'" + + substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/libclang.py \ + --replace "/usr/lib/clang" "${llvmPackages.clang.cc}/lib/clang" ''; }); clighter8 = clighter8.overrideAttrs(old: { preFixup = '' - sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc}/lib/libclang.so')|" \ + sed "/^let g:clighter8_libclang_path/s|')$|${llvmPackages.clang.cc.lib}/lib/libclang.so')|" \ -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim ''; }); |