diff options
| -rw-r--r-- | pkgs/development/libraries/alembic/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/pkgs/development/libraries/alembic/default.nix b/pkgs/development/libraries/alembic/default.nix index bd540cdd500..a185f19a9a1 100644 --- a/pkgs/development/libraries/alembic/default.nix +++ b/pkgs/development/libraries/alembic/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: +{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec outputs = [ "bin" "dev" "out" "lib" ]; - buildInputs = [ unzip cmake openexr hdf5 ]; + nativeBuildInputs = [ unzip cmake ]; + buildInputs = [ openexr hdf5-threadsafe ]; enableParallelBuilding = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b4063591476..06a6eaec0a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2688,6 +2688,13 @@ with pkgs; inherit gfortran; }); + hdf5-threadsafe = appendToName "threadsafe" (hdf5.overrideAttrs (oldAttrs: { + # Threadsafe hdf5 + # However, hdf5 hl (High Level) library is not considered stable + # with thread safety and should be disabled. + configureFlags = oldAttrs.configureFlags ++ ["--enable-threadsafe" "--disable-hl" ]; + })); + hdfview = callPackage ../tools/misc/hdfview { javac = jdk; }; |