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

cquery: 2018-05-01 -> 2018-08-08 (#44726)

Browse Source 
This also extends the wrapper to explicitly set the cache
directory, since it is required for every invokation with
the `--init` option.
This commit is contained in:
tobim 2018-08-09 01:31:15 +02:00 committed by xeji
parent 50f3d41563
commit 78e8173e57
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/development/tools/misc/cquery/default.nix
View File

@ -5,8 +5,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cquery-project"; owner = "cquery-project";
repo = "cquery"; repo = "cquery";
rev = "34b357bc5e873d52d2aa41287c6e138244cea109"; rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea";
sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c"; sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -15,7 +15,7 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "cquery-${version}"; name = "cquery-${version}";
version = "2018-05-01"; version = "2018-08-08";
inherit src; inherit src;
@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DSYSTEM_CLANG=ON" "-DSYSTEM_CLANG=ON"
"-DCLANG_CXX=ON" "-DCLANG_CXX=ON"
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12"
]; ];
shell = stdenv.shell; shell = stdenv.shell;
@ -47,6 +48,10 @@ stdenv.mkDerivation rec {
installCheckPhase = '' installCheckPhase = ''
pushd ${src} pushd ${src}
$out/bin/cquery --ci --test-unit $out/bin/cquery --ci --test-unit
# The integration tests have to be disabled because cquery ignores `--init`
# if they are invoked, which means it won't find the system includes.
#$out/bin/cquery --ci --test-index
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

2
pkgs/development/tools/misc/cquery/wrapper
View File

@ -1,6 +1,6 @@
#! @shell@ -e #! @shell@ -e
initString="--init={\"extraClangArguments\": [@standard_library_includes@" initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@"
if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then
read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} read -a cflags_array <<< ${NIX_CFLAGS_COMPILE}