From 3a7a990ee94107d9f0885bc82ab6357998a6d588 Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Tue, 3 Sep 2019 22:04:15 +0200
Subject: [PATCH] irods: build with current version of llvm

---
 pkgs/tools/filesystems/irods/default.nix | 6 ++++++
 pkgs/top-level/all-packages.nix          | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index 031c1440fcf..14790ae7087 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -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"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6a2c3692f7e..3164266ff6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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; };
           })