pyrox.dev / nixpkgs
lol
fork atom

hdf4: Make szip dependency optional.

Philipp Hausmann a1ec03a2 01c3847b

+8 -5
unified split
+5 -4
pkgs/tools/misc/hdf4/default.nix
··· 2 2 , fetchurl 3 3 , cmake 4 4 , libjpeg 5 - , szip 6 5 , zlib 6 + , szip ? null 7 7 }: 8 8 9 9 stdenv.mkDerivation rec { ··· 21 21 zlib 22 22 ]; 23 23 24 - preConfigure = "export SZIP_INSTALL=${szip}"; 24 + preConfigure = stdenv.lib.optionalString (szip != null) "export SZIP_INSTALL=${szip}"; 25 25 26 26 cmakeFlags = [ 27 27 "-DBUILD_SHARED_LIBS=ON" ··· 31 31 "-DHDF4_BUILD_WITH_INSTALL_NAME=OFF" 32 32 "-DHDF4_ENABLE_JPEG_LIB_SUPPORT=ON" 33 33 "-DHDF4_ENABLE_NETCDF=OFF" 34 - "-DHDF4_ENABLE_SZIP_ENCODING=ON" 35 - "-DHDF4_ENABLE_SZIP_SUPPORT=ON" 36 34 "-DHDF4_ENABLE_Z_LIB_SUPPORT=ON" 37 35 "-DHDF4_BUILD_FORTRAN=OFF" 38 36 "-DJPEG_DIR=${libjpeg}" 37 + ] ++ stdenv.lib.optionals (szip != null) [ 38 + "-DHDF4_ENABLE_SZIP_ENCODING=ON" 39 + "-DHDF4_ENABLE_SZIP_SUPPORT=ON" 39 40 ]; 40 41 41 42 doCheck = true;
+3 -1
pkgs/top-level/all-packages.nix
··· 2363 2363 2364 2364 hddtemp = callPackage ../tools/misc/hddtemp { }; 2365 2365 2366 - hdf4 = callPackage ../tools/misc/hdf4 { }; 2366 + hdf4 = callPackage ../tools/misc/hdf4 { 2367 + szip = null; 2368 + }; 2367 2369 2368 2370 hdf5 = callPackage ../tools/misc/hdf5 { 2369 2371 gfortran = null;