From 9eeea0b9efa5c0a07146494e7426278adad44ce7 Mon Sep 17 00:00:00 2001 From: Markus Ankenbrand Date: Mon, 2 Jul 2018 17:00:16 +0200 Subject: [PATCH] rPackages.rhdf5: fix installation Fix #42878 --- pkgs/development/r-modules/default.nix | 4 ++++ pkgs/development/r-modules/patches/rhdf5.patch | 12 ++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/r-modules/patches/rhdf5.patch diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 996e3932d2a2..dc8b4d1fb156 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -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/ diff --git a/pkgs/development/r-modules/patches/rhdf5.patch b/pkgs/development/r-modules/patches/rhdf5.patch new file mode 100644 index 000000000000..86ada84c722f --- /dev/null +++ b/pkgs/development/r-modules/patches/rhdf5.patch @@ -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 ../../