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:
Doron Behar
2026-04-14 17:18:19 +03:00
parent cc3efd5411
commit 96e0d84b53
2 changed files with 6 additions and 5 deletions

View File

@@ -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;

View File

@@ -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;