diff options
| author | Will Dietz <w@wdtz.org> | 2018-10-16 10:39:08 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2018-10-16 12:30:06 -0500 |
| commit | fc69a394fa0b7c3358c8bb4d81a340693f15d39e (patch) | |
| tree | 5a8e9fb83a687ef2a6f14871c295da1096003661 /pkgs/development/tools/misc/cquery | |
| parent | 8070a6333f3fc41ef93c2b0e07f999459615cc8d (diff) | |
| download | nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.tar nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.tar.gz nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.tar.bz2 nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.tar.lz nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.tar.xz nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.tar.zst nixpkgs-fc69a394fa0b7c3358c8bb4d81a340693f15d39e.zip | |
cquery: 2018-08-08 -> 2018-10-14 (llvm6 -> llvm7)
also simplify include expression a touch
Diffstat (limited to 'pkgs/development/tools/misc/cquery')
| -rw-r--r-- | pkgs/development/tools/misc/cquery/default.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/tools/misc/cquery/default.nix b/pkgs/development/tools/misc/cquery/default.nix index d6c8f1f33ee..f032a85173a 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 = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea"; - sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1"; + rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e"; + sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx"; fetchSubmodules = true; }; @@ -15,7 +15,7 @@ let in stdenv.mkDerivation rec { name = "cquery-${version}"; - version = "2018-08-08"; + version = "2018-10-14"; inherit src; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postFixup = '' # We need to tell cquery where to find the standard library headers. - standard_library_includes="\\\"-isystem\\\", \\\"${if (stdenv.hostPlatform.libc == "glibc") then stdenv.cc.libc.dev else stdenv.cc.libc}/include\\\"" + standard_library_includes="\\\"-isystem\\\", \\\"${stdenv.lib.getDev stdenv.cc.libc}/include\\\"" standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\"" export standard_library_includes |