From 72c388eed4e12a591833e3c51e419b1af678cee6 Mon Sep 17 00:00:00 2001 From: Justin Bedo Date: Fri, 6 May 2022 10:53:50 +1000 Subject: [PATCH] rPackages.Rhdf5lib: fix build Patch is no-longer necessary; HDF5 no-longer vendored --- pkgs/development/r-modules/default.nix | 6 +----- pkgs/development/r-modules/patches/Rhdf5lib.patch | 12 ------------ 2 files changed, 1 insertion(+), 17 deletions(-) delete mode 100644 pkgs/development/r-modules/patches/Rhdf5lib.patch diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c8f8934e866..39937016776 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -389,7 +389,7 @@ let Rglpk = [ pkgs.glpk ]; RGtk2 = [ pkgs.gtk2.dev ]; rhdf5 = [ pkgs.zlib ]; - Rhdf5lib = [ pkgs.zlib.dev ]; + Rhdf5lib = with pkgs; [ zlib.dev hdf5.dev ]; Rhpc = with pkgs; [ zlib bzip2.dev icu xz.dev mpi pcre.dev ]; Rhtslib = with pkgs; [ zlib.dev automake autoconf bzip2.dev xz.dev curl.dev ]; rjags = [ pkgs.jags ]; @@ -997,10 +997,6 @@ let patchPhase = "patchShebangs configure"; }); - Rhdf5lib = old.Rhdf5lib.overrideDerivation (attrs: { - patches = [ ./patches/Rhdf5lib.patch ]; - }); - rJava = old.rJava.overrideDerivation (attrs: { preConfigure = '' export JAVA_CPPFLAGS=-I${pkgs.jdk}/include/ diff --git a/pkgs/development/r-modules/patches/Rhdf5lib.patch b/pkgs/development/r-modules/patches/Rhdf5lib.patch deleted file mode 100644 index b5233df4452..00000000000 --- a/pkgs/development/r-modules/patches/Rhdf5lib.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/configure b/configure -index e2d292e..b13c0db 100755 ---- a/configure -+++ b/configure -@@ -3874,6 +3874,7 @@ - - echo "building the hdf5 library..."; - cd ../; -+sed -i 's#/bin/mv#mv#' configure - ./configure --with-pic --enable-shared=no --enable-cxx --enable-hl \ - --with-szlib=${SZIP_HOME} --with-zlib=${ZLIB_HOME} \ - ${WITH_S3_VFD} \