diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix
index 085a62509620..1e5420467e12 100644
--- a/pkgs/development/r-modules/default.nix
+++ b/pkgs/development/r-modules/default.nix
@@ -1809,7 +1809,7 @@ let
     });
 
     Rhdf5lib = let
-      hdf5 = pkgs.hdf5_1_10.overrideAttrs (attrs: {configureFlags = attrs.configureFlags ++ [ "--enable-cxx" ];});
+      hdf5 = pkgs.hdf5_1_10;
     in old.Rhdf5lib.overrideAttrs (attrs: {
       propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ hdf5.dev pkgs.libaec ];
       patches = [ ./patches/Rhdf5lib.patch ];
diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix
index dda8fd3a8fa4..c74911d241ad 100644
--- a/pkgs/tools/misc/hdf5/1.10.nix
+++ b/pkgs/tools/misc/hdf5/1.10.nix
@@ -2,6 +2,7 @@
 , stdenv
 , fetchurl
 , removeReferencesTo
+, cppSupport ? true
 , zlibSupport ? true
 , zlib
 , enableShared ? !stdenv.hostPlatform.isStatic
@@ -28,7 +29,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = optional zlibSupport zlib;
 
   configureFlags = optional enableShared "--enable-shared"
-    ++ optional javaSupport "--enable-java";
+    ++ optional javaSupport "--enable-java"
+    ++ optional cppSupport "--enable-cxx";
 
   patches = [ ];
 
@@ -49,6 +51,7 @@ stdenv.mkDerivation rec {
       applications for managing, manipulating, viewing, and analyzing data in the HDF5 format.
     '';
     license = lib.licenses.bsd3; # Lawrence Berkeley National Labs BSD 3-Clause variant
+    maintainers = with lib.maintainers; [ stephen-huan ];
     homepage = "https://www.hdfgroup.org/HDF5/";
     platforms = lib.platforms.unix;
   };