1
0
Fork 1
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:
Jörg Thalheim 2018-07-03 14:13:03 +01:00 committed by GitHub
commit 64219950fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 0 deletions

View file

@ -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/

View 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 ../../