branch r-updates updated: gnu: r-rhdf5lib: Adjust modifications to Makevars.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

rekado pushed a commit to branch r-updates
in repository guix.

The following commit(s) were added to refs/heads/r-updates by this push:
     new 651dc5ce8c gnu: r-rhdf5lib: Adjust modifications to Makevars.
651dc5ce8c is described below

commit 651dc5ce8cf500bad17ea1aff6270478f898ab94
Author: Ricardo Wurmus <rekado@elephly.net>
AuthorDate: Fri Nov 3 18:51:35 2023 +0100

    gnu: r-rhdf5lib: Adjust modifications to Makevars.
    
    * gnu/packages/bioconductor.scm (r-rhdf5lib)[arguments]: Adjust patch.
    
    Change-Id: Iaef3d2d80c22de1c2a0b64e7c13f5fa3b8e5719d
---
 gnu/packages/bioconductor.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/bioconductor.scm b/gnu/packages/bioconductor.scm
index 6020f313f9..18d24784b2 100644
--- a/gnu/packages/bioconductor.scm
+++ b/gnu/packages/bioconductor.scm
@@ -20569,8 +20569,6 @@ block processing.")
                (substitute* "Makevars"
                  (("@BUILD_HDF5@") "")
                  (("@COPY_SZIP@") "")
-                 (("@ZLIB_LIB@") "-lz")
-                 (("@ZLIB_INCLUDE@") "")
                  (("HDF5_CXX_LIB=.*")
                   (string-append "HDF5_CXX_LIB="
                                  (assoc-ref inputs "hdf5") 
"/lib/libhdf5_cpp.a\n"))
@@ -20587,6 +20585,9 @@ block processing.")
                  (("HDF5_HL_CXX_LIB=.*")
                   (string-append "HDF5_HL_CXX_LIB="
                                  (assoc-ref inputs "hdf5") 
"/lib/libhdf5_hl_cpp.a\n"))
+                 (("@ZLIB_LIB_PATH@") "-lz")
+                 (("@ZLIB_INCLUDE_PATH@") "")
+
                  ;; szip is non-free software
                  (("cp \"\\$\\{SZIP_LIB\\}.*") "")
                  (("PKG_LIBS =.*") "PKG_LIBS = -lz -lhdf5\n"))))))))