alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

alembic: use threadsafe hdf5 (#30682)

Browse source 
* hdf5: introduce hdf5-threadsafe variant

Compiled with thread safe support and without the High Level library
which is incompatible with thread safety.

* alembic: clean buildInputs to nativeBuildInputs

* alembic: use hdf5-threadsafe
This commit is contained in:
Guillaume Bouchard 2018-01-16 11:31:35 +01:00 committed by Peter Hoeg
parent 2bb5e5e748
commit 2995066e9b
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pkgs/development/libraries/alembic/default.nix
View file

@ -1,4 +1,4 @@
{ stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5 }: { stdenv, fetchFromGitHub, unzip, cmake, openexr, hdf5-threadsafe }:
stdenv.mkDerivation rec stdenv.mkDerivation rec
{ {
@ -14,7 +14,8 @@ stdenv.mkDerivation rec
outputs = [ "bin" "dev" "out" "lib" ]; outputs = [ "bin" "dev" "out" "lib" ];
buildInputs = [ unzip cmake openexr hdf5 ]; nativeBuildInputs = [ unzip cmake ];
buildInputs = [ openexr hdf5-threadsafe ];
enableParallelBuilding = true; enableParallelBuilding = true;

7
pkgs/top-level/all-packages.nix
View file

@ -2688,6 +2688,13 @@ with pkgs;
inherit gfortran; 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 { hdfview = callPackage ../tools/misc/hdfview {
javac = jdk; javac = jdk;
}; };