diff --git a/pkgs/by-name/av/avro-cpp/package.nix b/pkgs/by-name/av/avro-cpp/package.nix
index b0bd09a65756f..05a64ac226184 100644
--- a/pkgs/by-name/av/avro-cpp/package.nix
+++ b/pkgs/by-name/av/avro-cpp/package.nix
@@ -9,12 +9,12 @@
   versionCheckHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avro-c++";
   version = "1.12.0";
 
   src = fetchurl {
-    url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz";
+    url = "mirror://apache/avro/avro-${finalAttrs.version}/cpp/avro-cpp-${finalAttrs.version}.tar.gz";
     hash = "sha256-8u33cSanWw7BrRZncr4Fg1HOo9dESL5+LO8gBQwPmKs=";
   };
 
@@ -49,4 +49,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ rasendubi ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/tools/filesystems/irods/common.nix b/pkgs/tools/filesystems/irods/common.nix
index 9f77802b66ce7..12c4129af69d4 100644
--- a/pkgs/tools/filesystems/irods/common.nix
+++ b/pkgs/tools/filesystems/irods/common.nix
@@ -26,7 +26,7 @@
   fmt,
   nlohmann_json,
   curl,
-  spdlog_rods,
+  spdlog,
   bison,
   flex,
 }:
@@ -63,7 +63,7 @@
     nanodbc
     fmt
     nlohmann_json
-    spdlog_rods
+    spdlog
     curl
   ];
 
@@ -79,7 +79,7 @@
     "-DIRODS_EXTERNALS_FULLPATH_NANODBC=${nanodbc}"
     "-DIRODS_EXTERNALS_FULLPATH_FMT=${fmt}"
     "-DIRODS_EXTERNALS_FULLPATH_JSON=${nlohmann_json}"
-    "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog_rods}"
+    "-DIRODS_EXTERNALS_FULLPATH_SPDLOG=${spdlog}"
     "-DIRODS_LINUX_DISTRIBUTION_NAME=nix"
     "-DIRODS_LINUX_DISTRIBUTION_VERSION_MAJOR=1.0"
     "-DCPACK_GENERATOR=TGZ"
diff --git a/pkgs/tools/filesystems/irods/default.nix b/pkgs/tools/filesystems/irods/default.nix
index e5e6f29e7eb42..a1fbb5d0f1345 100644
--- a/pkgs/tools/filesystems/irods/default.nix
+++ b/pkgs/tools/filesystems/irods/default.nix
@@ -30,6 +30,7 @@
   curl,
   bison,
   flex,
+  fetchurl,
 }:
 
 let
@@ -45,9 +46,22 @@ let
         --replace-fail '$'{exec_prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@
     '';
   });
+  avro-cpp_rods = avro-cpp_llvm.overrideAttrs (attrs: {
+    inherit stdenv;
+    version = "1.11.3";
+    src = attrs.src.overrideAttrs rec {
+      outputHash = "sha256-+6JCrvd+yBnQdWH8upN1FyGVbejQyujh8vMAtUszG64=";
+    };
+    patches = [ ];
+    preConfigure = ''
+      substituteInPlace test/SchemaTests.cc --replace "BOOST_CHECKPOINT" "BOOST_TEST_CHECKPOINT"
+      substituteInPlace test/buffertest.cc --replace "BOOST_MESSAGE" "BOOST_TEST_MESSAGE"
+    '';
+  });
 in
 let
-  avro-cpp = avro-cpp_llvm;
+  avro-cpp = avro-cpp_rods;
+  spdlog = spdlog_rods;
   nanodbc = nanodbc_llvm;
 
   common = import ./common.nix {
@@ -79,7 +93,7 @@ let
       fmt
       nlohmann_json
       curl
-      spdlog_rods
+      spdlog
       bison
       flex
       ;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 770d6c409fabd..6fe2df67f049f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3728,7 +3728,7 @@ with pkgs;
     boost = boost178.override { inherit stdenv; };
     fmt = fmt_9.override { inherit stdenv; };
     nanodbc_llvm = nanodbc.override { inherit stdenv; };
-    avro-cpp_llvm = avro-cpp.override { inherit stdenv boost; };
+    avro-cpp_llvm = avro-cpp.override { inherit stdenv boost fmt; };
     spdlog_llvm = spdlog.override { inherit stdenv fmt; };
   })
     irods