diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2019-05-30 13:00:26 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 13:00:26 +0100 |
| commit | ecb99304ff365a23ea82f832679becde06d1e5f6 (patch) | |
| tree | d9ef46bae2a6107387979843bae8a7879d7c4ceb | |
| parent | 198afad520d6ff52a1171528da96492b931e549e (diff) | |
| parent | 144a03180578f2b39cbf2667944ee1431d7943cb (diff) | |
| download | nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.tar nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.tar.gz nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.tar.bz2 nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.tar.lz nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.tar.xz nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.tar.zst nixpkgs-ecb99304ff365a23ea82f832679becde06d1e5f6.zip | |
Merge pull request #62250 from Mic92/ccls
ccls: 0.20190301 -> 0.20190314.1
| -rw-r--r-- | pkgs/development/tools/misc/ccls/default.nix | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/tools/misc/ccls/default.nix b/pkgs/development/tools/misc/ccls/default.nix index e4aba3ab285..f643ecab69d 100644 --- a/pkgs/development/tools/misc/ccls/default.nix +++ b/pkgs/development/tools/misc/ccls/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "ccls-${version}"; - version = "0.20190301"; + version = "0.20190314.1"; src = fetchFromGitHub { owner = "MaskRay"; repo = "ccls"; rev = version; - sha256 = "1n60mly993czq3mnb82k8yqjrbfnsnx5v5dmr8ylqif3awcsk04i"; + sha256 = "1yvxliryqx2bc7r6ri4iafbrjx19jk8hnfbvq5xla72q0gqb97lf"; }; nativeBuildInputs = [ cmake makeWrapper ]; @@ -18,9 +18,12 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEM_CLANG=ON" "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" - "-DCMAKE_CXX_FLAGS=-fvisibility=hidden" ]; + preConfigure = '' + cmakeFlagsArray+=(-DCMAKE_CXX_FLAGS="-fvisibility=hidden -fno-rtti") + ''; + shell = runtimeShell; postFixup = '' # We need to tell ccls where to find the standard library headers. |