diff options
| author | Justin Bedo <cu@cua0.org> | 2024-01-17 09:34:31 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2024-01-17 09:34:31 +1100 |
| commit | 9941724e23b72aca387e963ce2318cfaed2b3304 (patch) | |
| tree | a059e9b0d1f67c99a1afe4cd17483e0fad03cbcc /pkgs | |
| parent | a947ea124a24829588decff9a604a6a88cc51ccc (diff) | |
| download | nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.tar nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.tar.gz nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.tar.bz2 nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.tar.lz nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.tar.xz nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.tar.zst nixlib-9941724e23b72aca387e963ce2318cfaed2b3304.zip | |
rPackages.rhdf5filters: simplify patch
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/development/r-modules/patches/rhdf5filters.patch | 38 |
2 files changed, 9 insertions, 30 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0342f019ee0d..43d64f98639b 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1361,7 +1361,6 @@ let }); rhdf5filters = old.rhdf5filters.overrideAttrs (attrs: { - propagatedBuildInputs = with pkgs; attrs.propagatedBuildInputs ++ [ (hdf5-blosc.override {hdf5 = self.Rhdf5lib.hdf5;}) ]; patches = [ ./patches/rhdf5filters.patch ]; }); diff --git a/pkgs/development/r-modules/patches/rhdf5filters.patch b/pkgs/development/r-modules/patches/rhdf5filters.patch index 1774de50a375..da3b92f4cb0e 100644 --- a/pkgs/development/r-modules/patches/rhdf5filters.patch +++ b/pkgs/development/r-modules/patches/rhdf5filters.patch @@ -1,33 +1,13 @@ diff --git a/src/Makevars.in b/src/Makevars.in -index 3e55470..e87daf6 100644 +index 3e55470..656eae4 100644 --- a/src/Makevars.in +++ b/src/Makevars.in -@@ -21,12 +21,12 @@ export PKG_LDFLAGS=@LDFLAGS@ - all: copying $(SHLIB) - - #copy hdf5 library headers to package include --copying: libH5Zblosc.so libH5Zbz2.so libH5Zlzf.so @USE_VBZ@ -+copying: libH5Zbz2.so libH5Zlzf.so @USE_VBZ@ libH5Zzstd.so - mkdir -p "${USER_LIB_DIR}" -- cp ${BZIP2_LIB} ${BLOSC_LIB} ${LZF_LIB} ${ZSTD_LIB} @VBZ_F_LIB@ "${USER_LIB_DIR}" -- -+ cp ${BZIP2_LIB} ${LZF_LIB} ${ZSTD_LIB} @VBZ_F_LIB@ "${USER_LIB_DIR}" -+ - libH5Zvbz.so: libH5Zzstd.so - $(MAKE) -C vbz - - libH5Zblosc.so: libH5Zzstd.so - $(MAKE) -C blosc -diff --git a/src/lzf/H5Zlzf.c b/src/lzf/H5Zlzf.c -index f71caa4..87965cd 100644 ---- a/src/lzf/H5Zlzf.c -+++ b/src/lzf/H5Zlzf.c -@@ -37,7 +37,7 @@ - #include <H5PLextern.h> - #include "hdf5.h" +@@ -15,7 +15,7 @@ export PKG_CXXPICFLAGS=@CXXPICFLAGS@ + export RANLIB=@RANLIB@ + export MAKE=@MAKE@ + export AR=@AR@ +-export PKG_CPPFLAGS=@CPPFLAGS@ -I"@RHDF5_INCLUDE@" ++export PKG_CPPFLAGS=@CPPFLAGS@ + export PKG_LDFLAGS=@LDFLAGS@ --#include "lzf.h" -+#include "./lzf/lzf.h" - - #define H5Z_FILTER_LZF_VERSION 4 - #define H5Z_FILTER_LZF 32000 + all: copying $(SHLIB) |