From 634ac0e5657f389be308095a1c2d6745fe8c8fcf Mon Sep 17 00:00:00 2001 From: Ivan Tkatchev Date: Thu, 3 Jun 2021 22:29:59 +0300 Subject: [PATCH] rhdf5: fix build (#125101) --- pkgs/development/r-modules/default.nix | 2 +- pkgs/development/r-modules/patches/Rhdf5lib.patch | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f16a6d0bb4a..5d88a7df25f 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -310,7 +310,7 @@ let Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; - Rhdf5lib = [ pkgs.zlib ]; + Rhdf5lib = [ pkgs.zlib.dev ]; Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.xz.dev pkgs.mpi pkgs.pcre.dev ]; Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ]; rjags = [ pkgs.jags ]; diff --git a/pkgs/development/r-modules/patches/Rhdf5lib.patch b/pkgs/development/r-modules/patches/Rhdf5lib.patch index dcd9b61798b..b5233df4452 100644 --- a/pkgs/development/r-modules/patches/Rhdf5lib.patch +++ b/pkgs/development/r-modules/patches/Rhdf5lib.patch @@ -2,11 +2,11 @@ diff --git a/configure b/configure index e2d292e..b13c0db 100755 --- a/configure +++ b/configure -@@ -2880,6 +2880,7 @@ $MAKE +@@ -3874,6 +3874,7 @@ + echo "building the hdf5 library..."; cd ../; - ## we add the '-w' flag to suppress all the warnings hdf5 prints +sed -i 's#/bin/mv#mv#' configure - ./configure --with-pic --enable-shared=no --enable-cxx \ - --with-szlib \ - CXX="${CXX}" CXFLAGS="${CXXFLAGS} -w" \ + ./configure --with-pic --enable-shared=no --enable-cxx --enable-hl \ + --with-szlib=${SZIP_HOME} --with-zlib=${ZLIB_HOME} \ + ${WITH_S3_VFD} \