diff options
| -rw-r--r-- | pkgs/tools/misc/hdf4/default.nix | 9 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/tools/misc/hdf4/default.nix b/pkgs/tools/misc/hdf4/default.nix index a227030f0bc4..bc8ea769e8be 100644 --- a/pkgs/tools/misc/hdf4/default.nix +++ b/pkgs/tools/misc/hdf4/default.nix @@ -2,8 +2,8 @@ , fetchurl , cmake , libjpeg -, szip , zlib +, szip ? null }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { zlib ]; - preConfigure = "export SZIP_INSTALL=${szip}"; + preConfigure = stdenv.lib.optionalString (szip != null) "export SZIP_INSTALL=${szip}"; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" @@ -31,11 +31,12 @@ stdenv.mkDerivation rec { "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" "-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON" "-DHDF4_ENABLE_NETCDF=OFF" - "-DHDF4_ENABLE_SZIP_ENCODING=ON" - "-DHDF4_ENABLE_SZIP_SUPPORT=ON" "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" "-DHDF4_BUILD_FORTRAN=OFF" "-DJPEG_DIR=${libjpeg}" + ] ++ stdenv.lib.optionals (szip != null) [ + "-DHDF4_ENABLE_SZIP_ENCODING=ON" + "-DHDF4_ENABLE_SZIP_SUPPORT=ON" ]; doCheck = true; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209520097f04..7364d47d9904 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2362,7 +2362,9 @@ with pkgs; hddtemp = callPackage ../tools/misc/hddtemp { }; - hdf4 = callPackage ../tools/misc/hdf4 { }; + hdf4 = callPackage ../tools/misc/hdf4 { + szip = null; + }; hdf5 = callPackage ../tools/misc/hdf5 { gfortran = null; |