From 70f87e66b3936ab449c007e3050baedd741124e0 Mon Sep 17 00:00:00 2001 From: Pavel Chuprikov Date: Sat, 22 Sep 2018 17:52:35 +0200 Subject: [PATCH 1/3] vim plugins: use v6.0 of the Clang library clighter8 plugin seems to be using python bindings for clang 6.0 clang_complete, another plugin using clang, works ok with this version --- pkgs/misc/vim-plugins/default.nix | 1 + pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 4cde30556a3..f5053c2ec6e 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 719ff9a5d6b..be8d2e0cfa7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22654,8 +22654,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 { From 71bf86d056700fc62b9771d5b7a68fbb25de9e43 Mon Sep 17 00:00:00 2001 From: Pavel Chuprikov Date: Sun, 17 Jun 2018 17:39:02 +0200 Subject: [PATCH 2/3] clang_complete (vim): fix multiple clang outputs Clang-specific headers and dynamic libraries now go to different outputs, and clang_complete must be able to find both --- pkgs/misc/vim-plugins/overrides.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index bc4f0faefb4..b562111b2a0 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -101,6 +101,9 @@ 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" ''; }); From 41f0e933fdb4116d799f1fc26d3c9b4fdef9f3d1 Mon Sep 17 00:00:00 2001 From: Pavel Chuprikov Date: Sat, 22 Sep 2018 17:09:25 +0200 Subject: [PATCH 3/3] clighter8 (vim): set libclang path to lib output --- pkgs/misc/vim-plugins/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix index b562111b2a0..e7d95fb50b5 100644 --- a/pkgs/misc/vim-plugins/overrides.nix +++ b/pkgs/misc/vim-plugins/overrides.nix @@ -109,7 +109,7 @@ with generated; 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 ''; });