From 96e0d84b53f99bed4da918282644c73a4c9ca8dc Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 14 Apr 2026 17:18:19 +0300
Subject: [PATCH] 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.
---
 pkgs/development/interpreters/gnudatalanguage/default.nix | 3 ++-
 pkgs/tools/misc/hdf5/default.nix                          | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 7c22a9f50efb..d16c97bad0ae 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -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;
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 03b37ba350ee..b67fa5f4e3a3 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -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;