irods: build with current version of llvm
This commit is contained in:
parent
bd85a832c1
commit
3a7a990ee9
|
@ -30,6 +30,12 @@ in rec {
|
|||
# but we don't use /usr with nix, so remove only 2 items.
|
||||
patches = [ ./irods_root_path.patch ];
|
||||
|
||||
NIX_CFLAGS_COMPILE = [
|
||||
# fix build with recent llvm versions
|
||||
"-Wno-deprecated-register"
|
||||
"-Wno-deprecated-declarations"
|
||||
];
|
||||
|
||||
preConfigure = common.preConfigure + ''
|
||||
patchShebangs ./test
|
||||
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"
|
||||
|
|
|
@ -3902,8 +3902,8 @@ in
|
|||
idevicerestore = callPackage ../tools/misc/idevicerestore { };
|
||||
|
||||
inherit (callPackages ../tools/filesystems/irods rec {
|
||||
stdenv = llvmPackages_38.libcxxStdenv;
|
||||
libcxx = llvmPackages_38.libcxx;
|
||||
stdenv = llvmPackages.libcxxStdenv;
|
||||
libcxx = llvmPackages.libcxx;
|
||||
boost = boost160.override { inherit stdenv; };
|
||||
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
|
||||
})
|
||||
|
|
Loading…
Reference in a new issue