summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorRok Garbas <rok@garbas.si>2014-07-24 12:43:43 +0200
committerRok Garbas <rok@garbas.si>2014-07-24 12:43:43 +0200
commit0953235369aea57cf31023293366c2d61cb42918 (patch)
treea76b1b5214fa702c266fb408ca2f63bbfeb82a64 /pkgs/misc
parentb0b4078bfca2a6f63203742308b5003586185108 (diff)
downloadnixlib-0953235369aea57cf31023293366c2d61cb42918.tar
nixlib-0953235369aea57cf31023293366c2d61cb42918.tar.gz
nixlib-0953235369aea57cf31023293366c2d61cb42918.tar.bz2
nixlib-0953235369aea57cf31023293366c2d61cb42918.tar.lz
nixlib-0953235369aea57cf31023293366c2d61cb42918.tar.xz
nixlib-0953235369aea57cf31023293366c2d61cb42918.tar.zst
nixlib-0953235369aea57cf31023293366c2d61cb42918.zip
vimPlugins.YouCompleteMe: updated to latest
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/vim-plugins/default.nix14
1 files changed, 8 insertions, 6 deletions
diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix
index d316d3a3cd3c..4142bce3b371 100644
--- a/pkgs/misc/vim-plugins/default.nix
+++ b/pkgs/misc/vim-plugins/default.nix
@@ -1,4 +1,4 @@
-{ fetchurl, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }:
+{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, clang }:
 
 /*
 About Vim and plugins
@@ -111,11 +111,11 @@ in rec
   YouCompleteMe = stdenv.mkDerivation {
     src = fetchgit {
       url = "https://github.com/Valloric/YouCompleteMe.git";
-      rev = "abfc3ee36adab11c0c0b9d086a164a69006fec79";
-      sha256 = "1d25dp5kgqickl06hqvx4j3z51zblhsn3q3by2hayyj3g2zps4gm";
+      rev = "67288080ea7057ea3111cb4c863484e3b150e738";
+      sha256 = "1a3rwdl458z1yrp50jdwp629j4al0zld21n15sad28g51m8gw5ka";
      };
 
-    name = "youcompleteme-git-abfc3ee";
+    name = "youcompleteme-git-6728808";
     buildInputs = [ python cmake clang.clang ];
 
     configurePhase = ":";
@@ -125,10 +125,12 @@ in rec
       mkdir -p $target
       cp -a ./ $target
 
+
       mkdir $target/build
       cd $target/build
-      cmake -G "Unix Makefiles" . $target/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
-      make -j -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
+      cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON
+      make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}}
+      ${bash}/bin/bash $target/install.sh --clang-completer
 
       ${vimHelpTags}
       vimHelpTags $target