cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #125556 from ivan-tkatchev/rhdf5

Browse source 
rhdf5: fix build (#125101)
This commit is contained in:
Artturi 2021-08-07 02:29:52 +03:00 committed by GitHub
commit 1f8e01479b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/development/r-modules/default.nix
View file

@ -309,7 +309,7 @@ let
Rglpk = [ pkgs.glpk ]; Rglpk = [ pkgs.glpk ];
RGtk2 = [ pkgs.gtk2.dev ]; RGtk2 = [ pkgs.gtk2.dev ];
rhdf5 = [ pkgs.zlib ]; 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 ]; 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 ]; Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf pkgs.bzip2.dev pkgs.xz.dev pkgs.curl.dev ];
rjags = [ pkgs.jags ]; rjags = [ pkgs.jags ];

10
pkgs/development/r-modules/patches/Rhdf5lib.patch
View file

@ -2,11 +2,11 @@ diff --git a/configure b/configure
index e2d292e..b13c0db 100755 index e2d292e..b13c0db 100755
--- a/configure --- a/configure
+++ b/configure +++ b/configure
@@ -2880,6 +2880,7 @@ $MAKE @@ -3874,6 +3874,7 @@
echo "building the hdf5 library..."; echo "building the hdf5 library...";
cd ../; cd ../;
## we add the '-w' flag to suppress all the warnings hdf5 prints
+sed -i 's#/bin/mv#mv#' configure +sed -i 's#/bin/mv#mv#' configure
./configure --with-pic --enable-shared=no --enable-cxx \ ./configure --with-pic --enable-shared=no --enable-cxx --enable-hl \
--with-szlib \ --with-szlib=${SZIP_HOME} --with-zlib=${ZLIB_HOME} \
CXX="${CXX}" CXFLAGS="${CXXFLAGS} -w" \ ${WITH_S3_VFD} \