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

Merge pull request #48580 from dtzWill/update/cquery-llvm7

Browse Source 
cquery: 2018-08-08 -> 2018-10-14 (llvm6 -> llvm7)
This commit is contained in:
Jörg Thalheim 2018-10-18 19:27:05 +01:00 committed by GitHub
commit ad250c18f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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 = "e17df5b41e5a687559a0b75dba9c0f1f399c4aea"; rev = "a95a6503d68a85baa25465ce147b7fc20f4a552e";
sha256 = "06z8bg73jppb4msiqvsjbpz6pawwny831k56w5kcxrjgp22v24s1"; sha256 = "0rxbdln7dqkdw4q8rhclssgwypq16g9flkwmaabsr8knckbszxrx";
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-08-08"; version = "2018-10-14";
inherit src; inherit src;
@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
postFixup = '' postFixup = ''
# We need to tell cquery where to find the standard library headers. # 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\\\"" standard_library_includes+=", \\\"-isystem\\\", \\\"${llvmPackages.libcxx}/include/c++/v1\\\""
export standard_library_includes export standard_library_includes

2
pkgs/top-level/all-packages.nix
View File

@ -8280,7 +8280,7 @@ with pkgs;
cpplint = callPackage ../development/tools/analysis/cpplint { }; cpplint = callPackage ../development/tools/analysis/cpplint { };
cquery = callPackage ../development/tools/misc/cquery { cquery = callPackage ../development/tools/misc/cquery {
llvmPackages = llvmPackages_6; llvmPackages = llvmPackages_7;
}; };
creduce = callPackage ../development/tools/misc/creduce { creduce = callPackage ../development/tools/misc/creduce {