diff options
| author | Justin Bedo <cu@cua0.org> | 2022-05-06 10:53:50 +1000 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2022-05-06 10:54:43 +1000 |
| commit | 72c388eed4e12a591833e3c51e419b1af678cee6 (patch) | |
| tree | 89230adcfbd5afd483d54593e7cca4d8da21acfb /pkgs/development/r-modules/default.nix | |
| parent | db5e7f7a928f9504ece7dfccce9f52dc36360fbb (diff) | |
rPackages.Rhdf5lib: fix build
Patch is no-longer necessary; HDF5 no-longer vendored
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index c8f8934e866a1..3993701677626 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/ |