JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #47171 from pschuprikov/vim-clang-fix

Browse Source 
vim plugins: fix for multiple clang outputs, use clang 6.0
This commit is contained in:
Renaud 2018-11-25 15:38:59 +01:00 committed by GitHub
commit 18eb9e27a3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/misc/vim-plugins/default.nix
View File

@ -19,6 +19,7 @@ let
overrides = callPackage ./overrides.nix { overrides = callPackage ./overrides.nix {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices; inherit (darwin.apple_sdk.frameworks) Cocoa CoreFoundation CoreServices;
inherit buildVimPluginFrom2Nix; inherit buildVimPluginFrom2Nix;
inherit llvmPackages;
}; };
overriden = generated // (overrides generated); overriden = generated // (overrides generated);

5
pkgs/misc/vim-plugins/overrides.nix
View File

@ -101,12 +101,15 @@ with generated;
preFixup = '' preFixup = ''
substituteInPlace "$out"/share/vim-plugins/clang_complete/plugin/clang_complete.vim \ 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'" --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: { clighter8 = clighter8.overrideAttrs(old: {
preFixup = '' 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 -i "$out"/share/vim-plugins/clighter8/plugin/clighter8.vim
''; '';
}); });

2
pkgs/top-level/all-packages.nix
View File

@ -22669,7 +22669,7 @@ with pkgs;
vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { }; vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { };
vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins {
llvmPackages = llvmPackages_39; llvmPackages = llvmPackages_6;
}); });
vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 { vimprobable2-unwrapped = callPackage ../applications/networking/browsers/vimprobable2 {