diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 8ab43953fcb7..5ffe4f810dcd 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -23,7 +23,7 @@ }: # cpp and mpi options are mutually exclusive -# (--enable-unsupported could be used to force the build) +# "-DALLOW_UNSUPPORTED=ON" could be used to force the build. assert !cppSupport || !mpiSupport; let @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { ++ lib.optional javaSupport "-DHDF5_BUILD_JAVA=ON" ++ lib.optional usev110Api "-DDEFAULT_API_VERSION=v110" ++ lib.optionals threadsafe [ - "-DDHDF5_ENABLE_THREADSAFE:BOOL=ON" + "-DHDF5_ENABLE_THREADSAFE:BOOL=ON" "-DHDF5_BUILD_HL_LIB=OFF" ] # broken in nixpkgs since around 1.14.3 -> 1.14.4.3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35e6f4650587..4dce60fa305d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3141,7 +3141,10 @@ with pkgs; cppSupport = false; }; - hdf5-threadsafe = hdf5.override { threadsafe = true; }; + hdf5-threadsafe = hdf5.override { + cppSupport = false; + threadsafe = true; + }; heaptrack = kdePackages.callPackage ../development/tools/profiling/heaptrack { };