pyrox.dev
lol
Merge pull request #266076 from markuskowa/fix-netcdfcxx
netcdfcxx4: fix build, add patch for cmake
authored by
markuskowa
and committed by
GitHub
8458b6aa
483c8a14
+13
pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch
+13
pkgs/development/libraries/netcdf-cxx4/cmake-h5free.patch
···
1
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
+
index 60c699d..606b972 100644
3
+
--- a/CMakeLists.txt
4
+
+++ b/CMakeLists.txt
5
+
@@ -402,7 +402,7 @@ ELSE(MSVC)
6
+
FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED)
7
+
ENDIF(MSVC)
8
+
9
+
-CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARY_hdf5} H5free_memory "" HAVE_H5FREE_MEMORY)
10
+
+CHECK_LIBRARY_EXISTS(${HDF5_C_LIBRARIES} H5free_memory "" HAVE_H5FREE_MEMORY)
11
+
IF(NOT HAVE_H5FREE_MEMORY)
12
+
MESSAGE(STATUS "Plugin support requires libhdf5 with H5Free support. Your libhdf5 install does not provide H5Free. Please install a newer version of libhdf5 if you require plugin compression support.")
13
+
SET(NC_HAS_DEF_VAR_FILTER "")
+6
pkgs/development/libraries/netcdf-cxx4/default.nix
+6
pkgs/development/libraries/netcdf-cxx4/default.nix
···
10
10
sha256 = "sha256-GZ6n7dW3l8Kqrk2Xp2mxRTUWWQj0XEd2LDTG9EtrfhY=";
11
11
};
12
12
13
+
patches = [
14
+
# This fix is included upstream, remove with next upgrade
15
+
./cmake-h5free.patch
16
+
];
17
+
13
18
preConfigure = ''
14
19
cmakeFlags+="-Dabs_top_srcdir=$(readlink -f ./)"
15
20
'';
···
28
33
homepage = "https://www.unidata.ucar.edu/software/netcdf/";
29
34
license = lib.licenses.free;
30
35
platforms = lib.platforms.unix;
36
+
broken = stdenv.isDarwin;
31
37
};
32
38
}