diff options
| -rw-r--r-- | pkgs/misc/vim-plugins/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/misc/vim-plugins/overrides.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
3 files changed, 7 insertions, 3 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 ''; }); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fae517ef172f..d83ee1eaf90d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22668,8 +22668,8 @@ with pkgs; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; - vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { - llvmPackages = llvmPackages_39; + vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { + llvmPackages = llvmPackages_6; }); vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { |