rPackages.Rhdf5lib: fix build

Patch is no-longer necessary; HDF5 no-longer vendored
main
Justin Bedo 2 years ago
parent db5e7f7a92
commit 72c388eed4
No known key found for this signature in database
GPG Key ID: 2C18202C56C182BD
  1. 6
      pkgs/development/r-modules/default.nix
  2. 12
      pkgs/development/r-modules/patches/Rhdf5lib.patch

@ -389,7 +389,7 @@ let
Rglpk = [ pkgs.glpk ];
RGtk2 = [ pkgs.gtk2.dev ];
rhdf5 = [ pkgs.zlib ];
Rhdf5lib = [ pkgs.zlib.dev ];
Rhdf5lib = with pkgs; [ zlib.dev hdf5.dev ];
Rhpc = with pkgs; [ zlib bzip2.dev icu xz.dev mpi pcre.dev ];
Rhtslib = with pkgs; [ zlib.dev automake autoconf bzip2.dev xz.dev curl.dev ];
rjags = [ pkgs.jags ];
@ -997,10 +997,6 @@ let
patchPhase = "patchShebangs configure";
});
Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: {
patches = [ ./patches/Rhdf5lib.patch ];
});
rJava = old.rJava.overrideDerivation (attrs: {
preConfigure = ''
export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/

@ -1,12 +0,0 @@
diff --git a/configure b/configure
index e2d292e..b13c0db 100755
--- a/configure
+++ b/configure
@@ -3874,6 +3874,7 @@
echo "building the hdf5 library...";
cd ../;
+sed -i 's#/bin/mv#mv#' configure
./configure --with-pic --enable-shared=no --enable-cxx --enable-hl \
--with-szlib=${SZIP_HOME} --with-zlib=${ZLIB_HOME} \
${WITH_S3_VFD} \
Loading…
Cancel
Save