mirror of
https://github.com/NixOS/nixpkgs.git
synced 2026-07-21 16:11:22 +00:00
hdf5: enable szip with libaec
szip is unfree, that's why using it was disabled by default. Also, if
cmake was called with `-DHDF5_ENABLE_SZIP_SUPPORT=ON`, we got the
messages:
-- Could NOT find libaec (missing: libaec_DIR)
CMake Warning at CMakeFilters.cmake:221 (message):
SZIP support in HDF5 was enabled but not found
Meaning the library szip was no longer in use by this library since an
earlier release.
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
# Unfree optional dependency for hdf4 and hdf5
|
||||
enableSzip ? false,
|
||||
szip,
|
||||
libaec,
|
||||
enableHDF4 ? true,
|
||||
hdf4,
|
||||
hdf4-forced ? null,
|
||||
@@ -84,7 +85,7 @@ let
|
||||
mpiSupport = enableMPI;
|
||||
inherit mpi;
|
||||
szipSupport = enableSzip;
|
||||
inherit szip;
|
||||
inherit libaec;
|
||||
}
|
||||
// lib.optionalAttrs enableMPI {
|
||||
cppSupport = false;
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
fortran,
|
||||
zlibSupport ? true,
|
||||
zlib,
|
||||
szipSupport ? false,
|
||||
szip,
|
||||
szipSupport ? true,
|
||||
libaec,
|
||||
mpiSupport ? false,
|
||||
mpi,
|
||||
enableShared ? !stdenv.hostPlatform.isStatic,
|
||||
@@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
|
||||
zlibSupport
|
||||
zlib
|
||||
szipSupport
|
||||
szip
|
||||
libaec
|
||||
mpiSupport
|
||||
mpi
|
||||
;
|
||||
@@ -82,7 +82,7 @@ stdenv.mkDerivation rec {
|
||||
++ optional fortranSupport fortran;
|
||||
|
||||
buildInputs =
|
||||
optional fortranSupport fortran ++ optional szipSupport szip ++ optional javaSupport jdk;
|
||||
optional fortranSupport fortran ++ optional szipSupport libaec ++ optional javaSupport jdk;
|
||||
|
||||
propagatedBuildInputs = optional zlibSupport zlib ++ optional mpiSupport mpi;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user