diff options
| author | Ricardo Wurmus <rekado@elephly.net> | 2023-11-03 18:51:35 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2023-11-03 22:49:28 +0100 |
| commit | a9383428994dbe1b3266bfe020aba3c31e3a75f4 (patch) | |
| tree | 815537aac2ad814d9b26fa98f8a9b5fa085c0cec /gnu/packages | |
| parent | c82c9c80909facc0744aed89c4d90c8fb44b1a51 (diff) | |
| download | guix-a9383428994dbe1b3266bfe020aba3c31e3a75f4.tar.gz guix-a9383428994dbe1b3266bfe020aba3c31e3a75f4.zip | |
gnu: r-rhdf5lib: Adjust modifications to Makevars.
* gnu/packages/bioconductor.scm (r-rhdf5lib)[arguments]: Adjust patch.
Change-Id: Iaef3d2d80c22de1c2a0b64e7c13f5fa3b8e5719d
Diffstat (limited to 'gnu/packages')
| -rw-r--r-- | gnu/packages/bioconductor.scm | 5 |
1 files 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")))))))) |