diff options
author | tobim <tobim+github@fastmail.fm> | 2018-08-09 01:31:15 +0200 |
---|---|---|
committer | xeji <36407913+xeji@users.noreply.github.com> | 2018-08-09 01:31:15 +0200 |
commit | 78e8173e57d5774719abf7560ad6869c0b535cda (patch) | |
tree | 24c5f11407456d0f3eab9e9411d8773ae69b272b | |
parent | 50f3d415637329859dfca361dbea2e1f5ac6152e (diff) | |
download | nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.tar nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.tar.gz nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.tar.bz2 nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.tar.lz nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.tar.xz nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.tar.zst nixlib-78e8173e57d5774719abf7560ad6869c0b535cda.zip |
cquery: 2018-05-01 -> 2018-08-08 (#44726)
This also extends the wrapper to explicitly set the cache directory, since it is required for every invokation with the `--init` option.
-rw-r--r-- | pkgs/development/tools/misc/cquery/default.nix | 11 | ||||
-rw-r--r-- | pkgs/development/tools/misc/cquery/wrapper | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index 0b86deb52055..d6c8f1f33eec 100644 --- a/pkgs/development/tools/misc/cquery/default.nix +++ b/pkgs/development/tools/misc/cquery/default.nix @@ -5,8 +5,8 @@ let src = fetchFromGitHub { owner = "cquery-project"; repo = "cquery"; - rev = "34b357bc5e873d52d2aa41287c6e138244cea109"; - sha256 = "0i34v30cl73485bzpbis539x0iq9whpv0403ca5a9h6vqwnvdn7c"; + rev = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea"; + sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-05-01"; + version = "2018-08-08"; inherit src; @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DSYSTEM_CLANG=ON" "-DCLANG_CXX=ON" + "-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12" ]; shell = stdenv.shell; @@ -47,6 +48,10 @@ stdenv.mkDerivation rec { installCheckPhase = '' pushd ${src} $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; { diff --git a/pkgs/development/tools/misc/cquery/wrapper b/pkgs/development/tools/misc/cquery/wrapper index f0bea41536d0..534f900f94af 100644 --- a/pkgs/development/tools/misc/cquery/wrapper +++ b/pkgs/development/tools/misc/cquery/wrapper @@ -1,6 +1,6 @@ #! @shell@ -e -initString="--init={\"extraClangArguments\": [@standard_library_includes@" +initString="--init={\"cacheDirectory\": \"/tmp/cquery\", \"extraClangArguments\": [@standard_library_includes@" if [ "${NIX_CFLAGS_COMPILE}" != "" ]; then read -a cflags_array <<< ${NIX_CFLAGS_COMPILE} |