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

Merge pull request #56673 from Kaali/darwin-ccls 

Add Darwin support for ccls
This commit is contained in:
Jörg Thalheim 2019-03-05 10:49:18 +00:00 committed by GitHub
parent f60459a023 41a675258f
commit bf444fd442
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/development/tools/misc/ccls/default.nix
View File

@ -15,7 +15,11 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake makeWrapper ]; nativeBuildInputs = [ cmake makeWrapper ];
buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ]; buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ];
cmakeFlags = [ "-DSYSTEM_CLANG=ON" ]; cmakeFlags = [
"-DSYSTEM_CLANG=ON"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
"-DCMAKE_CXX_FLAGS=-fvisibility=hidden"
];
shell = runtimeShell; shell = runtimeShell;
postFixup = '' postFixup = ''
@ -37,7 +41,7 @@ stdenv.mkDerivation rec {
description = "A c/c++ language server powered by clang"; description = "A c/c++ language server powered by clang";
homepage = https://github.com/MaskRay/ccls; homepage = https://github.com/MaskRay/ccls;
license = licenses.asl20; license = licenses.asl20;
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.mic92 ]; maintainers = [ maintainers.mic92 ];
}; };
} }

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

@ -8579,6 +8579,7 @@ in
ccls = callPackage ../development/tools/misc/ccls { ccls = callPackage ../development/tools/misc/ccls {
llvmPackages = llvmPackages_latest; llvmPackages = llvmPackages_latest;
stdenv = llvmPackages_latest.stdenv;
}; };
credstash = with python3Packages; toPythonApplication credstash; credstash = with python3Packages; toPythonApplication credstash;