pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #42879 from iimog/fix-rhdf5

rPackages.rhdf5: fix installation

authored by Jörg Thalheim and committed by GitHub 64219950 ed209182

+16
unified split
+4
pkgs/development/r-modules/default.nix
··· 749 749 patches = [ ./patches/BayesXsrc.patch ]; 750 750 }); 751 751 752 + rhdf5 = old.rhdf5.overrideDerivation (attrs: { 753 + patches = [ ./patches/rhdf5.patch ]; 754 + }); 755 + 752 756 rJava = old.rJava.overrideDerivation (attrs: { 753 757 preConfigure = '' 754 758 export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/
+12
pkgs/development/r-modules/patches/rhdf5.patch
··· 1 + diff --git a/configure b/configure 2 + index e3e21e8..3d947b6 100755 3 + --- a/configure 4 + +++ b/configure 5 + @@ -2859,6 +2859,7 @@ fi; 6 + 7 + echo "building the bundled hdf5 library..."; 8 + cd ${BASEPBNAME}; 9 + +sed -i 's#/bin/mv#mv#' configure 10 + ./configure --with-pic --enable-shared=no CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" CC="${CC}" CFLAGS="${CFLAGS}" F77="${F77}" 11 + $MAKE lib 12 + cd ../../