diff options
| author | Markus Ankenbrand <markus@ankenbrand.me> | 2018-07-10 16:32:07 +0200 |
|---|---|---|
| committer | Markus Ankenbrand <markus@ankenbrand.me> | 2018-07-10 16:38:11 +0200 |
| commit | 89f44c1314e4bf541036b3377b4285a9ddf5bfa3 (patch) | |
| tree | 644a76810ec2fbafdd7f488a9fba626fcdbc79ad /pkgs/development/r-modules | |
| parent | 2698bb461fe36069a0bcfeec52d7c99eb476b134 (diff) | |
| download | nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.tar nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.tar.gz nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.tar.bz2 nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.tar.lz nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.tar.xz nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.tar.zst nixlib-89f44c1314e4bf541036b3377b4285a9ddf5bfa3.zip | |
rPackages.rhdf5: fix installation
Fix #43285
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/r-modules/patches/Rhdf5lib.patch | 12 | ||||
| -rw-r--r-- | pkgs/development/r-modules/patches/rhdf5.patch | 12 |
3 files changed, 15 insertions, 14 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index a7827cf8b290..d5b0aa010ca1 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -313,6 +313,7 @@ let Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; + Rhdf5lib = [ pkgs.zlib ]; Rhpc = [ pkgs.zlib pkgs.bzip2.dev pkgs.icu pkgs.lzma.dev pkgs.openmpi pkgs.pcre.dev ]; Rhtslib = [ pkgs.zlib.dev pkgs.automake pkgs.autoconf ]; RJaCGH = [ pkgs.zlib.dev ]; @@ -744,8 +745,8 @@ let patches = [ ./patches/BayesXsrc.patch ]; }); - rhdf5 = old.rhdf5.overrideDerivation (attrs: { - patches = [ ./patches/rhdf5.patch ]; + Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: { + patches = [ ./patches/Rhdf5lib.patch ]; }); rJava = old.rJava.overrideDerivation (attrs: { diff --git a/pkgs/development/r-modules/patches/Rhdf5lib.patch b/pkgs/development/r-modules/patches/Rhdf5lib.patch new file mode 100644 index 000000000000..dcd9b61798bd --- /dev/null +++ b/pkgs/development/r-modules/patches/Rhdf5lib.patch @@ -0,0 +1,12 @@ +diff --git a/configure b/configure +index e2d292e..b13c0db 100755 +--- a/configure ++++ b/configure +@@ -2880,6 +2880,7 @@ $MAKE + echo "building the hdf5 library..."; + cd ../; + ## we add the '-w' flag to suppress all the warnings hdf5 prints ++sed -i 's#/bin/mv#mv#' configure + ./configure --with-pic --enable-shared=no --enable-cxx \ + --with-szlib \ + CXX="${CXX}" CXFLAGS="${CXXFLAGS} -w" \ diff --git a/pkgs/development/r-modules/patches/rhdf5.patch b/pkgs/development/r-modules/patches/rhdf5.patch deleted file mode 100644 index 86ada84c722f..000000000000 --- a/pkgs/development/r-modules/patches/rhdf5.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 ../../ |