diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-15 13:18:54 +0200 |
| commit | b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1 (patch) | |
| tree | 1665938bf023545db2afcf42d924a47d7f2918b2 /pkgs/development/tools/misc/ccls/default.nix | |
| parent | 9f8a7d26798ced69f3185a59383bbb3db6b06bde (diff) | |
| parent | c860babfe6a512aa7c7e83751547347a137ecd67 (diff) | |
| download | nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.gz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.bz2 nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.lz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.xz nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.tar.zst nixpkgs-b6c6e1f9e8f72ad7caf3b7daec327f77a16ffba1.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/development/tools/misc/ccls/default.nix')
| -rw-r--r-- | pkgs/development/tools/misc/ccls/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index 008701615e7..e42c3e58db8 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -1,22 +1,22 @@ -{ stdenv, fetchFromGitHub, makeWrapper +{ stdenv, fetchFromGitHub , cmake, llvmPackages, rapidjson, runtimeShell }: stdenv.mkDerivation rec { pname = "ccls"; - version = "0.20190314.1"; + version = "0.20190823"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1yvxliryqx2bc7r6ri4iafbrjx19jk8hnfbvq5xla72q0gqb97lf"; + sha256 = "1qy1kf83mrvbhwl8m0h7ralwd3sid8y8fpk7pmy81y1nq8f1cf6f"; }; - nativeBuildInputs = [ cmake makeWrapper ]; + nativeBuildInputs = [ cmake ]; buildInputs = with llvmPackages; [ clang-unwrapped llvm rapidjson ]; cmakeFlags = [ - "-DSYSTEM_CLANG=ON" + "-DCCLS_VERSION=${version}" "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" ]; |