mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-26 23:52:33 +00:00
Merge pull request #42879 from iimog/fix-rhdf5
rPackages.rhdf5: fix installation
This commit is contained in:
commit
64219950fc
|
@ -749,6 +749,10 @@ let
|
|||
patches = [ ./patches/BayesXsrc.patch ];
|
||||
});
|
||||
|
||||
rhdf5 = old.rhdf5.overrideDerivation (attrs: {
|
||||
patches = [ ./patches/rhdf5.patch ];
|
||||
});
|
||||
|
||||
rJava = old.rJava.overrideDerivation (attrs: {
|
||||
preConfigure = ''
|
||||
export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
|
||||
|
|
12
pkgs/development/r-modules/patches/rhdf5.patch
Normal file
12
pkgs/development/r-modules/patches/rhdf5.patch
Normal file
|
@ -0,0 +1,12 @@
|
|||
diff --git a/configure b/configure
|
||||
index e3e21e8..3d947b6 100755
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2859,6 +2859,7 @@ fi;
|
||||
|
||||
echo "building the bundled hdf5 library...";
|
||||
cd ${BASEPBNAME};
|
||||
+sed -i 's#/bin/mv#mv#' configure
|
||||
./configure --with-pic --enable-shared=no CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" CC="${CC}" CFLAGS="${CFLAGS}" F77="${F77}"
|
||||
$MAKE lib
|
||||
cd ../../
|
Loading…
Reference in a new issue