Merge pull request #25352 from LnL7/darwin-ycmd

ycmd: copy libclang on darwin

authored by Daiderd Jordan and committed by GitHub 0bae6d0a 2f3cfe69

+5 -4
+5 -4
pkgs/development/tools/misc/ycmd/default.nix
··· 2 2 , gocode ? null 3 3 , godef ? null 4 4 , rustracerd ? null 5 - , Cocoa ? null 5 + , fixDarwinDylibNames, Cocoa ? null 6 6 }: 7 7 8 8 stdenv.mkDerivation rec { ··· 15 15 sha256 = "0p5knlxgy66zi229ns1lfdhz5lram93vahmmk54w98fr3h8b1yfj"; 16 16 }; 17 17 18 - buildInputs = [ cmake boost ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; 18 + buildInputs = [ cmake boost ] 19 + ++ stdenv.lib.optional stdenv.isDarwin [ fixDarwinDylibNames Cocoa ]; 19 20 20 21 buildPhase = '' 21 22 export EXTRA_CMAKE_ARGS=-DPATH_TO_LLVM_ROOT=${llvmPackages.clang-unwrapped} ··· 44 45 " ycmd/__main__.py 45 46 46 47 mkdir -p $out/lib/ycmd 47 - cp -r ycmd/ CORE_VERSION libclang.so.* ycm_core.so $out/lib/ycmd/ 48 + cp -r ycmd/ CORE_VERSION libclang.so.* libclang.dylib* ycm_core.so $out/lib/ycmd/ 48 49 49 50 mkdir -p $out/bin 50 51 ln -s $out/lib/ycmd/ycmd/__main__.py $out/bin/ycmd ··· 78 79 description = "A code-completion and comprehension server"; 79 80 homepage = https://github.com/Valloric/ycmd; 80 81 license = licenses.gpl3; 81 - maintainers = with maintainers; [ rasendubi cstrahan ]; 82 + maintainers = with maintainers; [ rasendubi cstrahan lnl7 ]; 82 83 platforms = platforms.all; 83 84 }; 84 85 }