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

irods: build with current version of llvm

Browse Source
This commit is contained in:
Franz Pletz 2019-09-03 22:04:15 +02:00
parent bd85a832c1
commit 3a7a990ee9
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/tools/filesystems/irods/default.nix
View File

@ -30,6 +30,12 @@ in rec {
# but we don't use /usr with nix, so remove only 2 items. # but we don't use /usr with nix, so remove only 2 items.
patches = [ ./irods_root_path.patch ]; patches = [ ./irods_root_path.patch ];
NIX_CFLAGS_COMPILE = [
# fix build with recent llvm versions
"-Wno-deprecated-register"
"-Wno-deprecated-declarations"
];
preConfigure = common.preConfigure + '' preConfigure = common.preConfigure + ''
patchShebangs ./test patchShebangs ./test
substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp" substituteInPlace plugins/database/CMakeLists.txt --replace "COMMAND cpp" "COMMAND ${gcc.cc}/bin/cpp"

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

@ -3902,8 +3902,8 @@ in
idevicerestore = callPackage ../tools/misc/idevicerestore { }; idevicerestore = callPackage ../tools/misc/idevicerestore { };
inherit (callPackages ../tools/filesystems/irods rec { inherit (callPackages ../tools/filesystems/irods rec {
stdenv = llvmPackages_38.libcxxStdenv; stdenv = llvmPackages.libcxxStdenv;
libcxx = llvmPackages_38.libcxx; libcxx = llvmPackages.libcxx;
boost = boost160.override { inherit stdenv; }; boost = boost160.override { inherit stdenv; };
avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; }; avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
}) })