diff options
| author | Justin Bedo <cu@cua0.org> | 2023-03-22 09:41:32 +1100 |
|---|---|---|
| committer | Justin Bedo <cu@cua0.org> | 2023-03-22 09:47:48 +1100 |
| commit | ccfbc19630465aaa666588417d38b56a557a1bff (patch) | |
| tree | 8dd91ce76a45fdea0c21a90d742f7abd5e9667aa /pkgs/development/r-modules/default.nix | |
| parent | a10887cb3fd7087c006b91197b6eb2b8730eebeb (diff) | |
| download | nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.tar nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.tar.gz nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.tar.bz2 nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.tar.lz nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.tar.xz nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.tar.zst nixpkgs-ccfbc19630465aaa666588417d38b56a557a1bff.zip | |
rPackages.Rhdf5lib: fix build
use nixpkgs provided hdf5 and libaec to resolve failing vendored code
Diffstat (limited to 'pkgs/development/r-modules/default.nix')
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 0966c96cbde..8913591d645 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 = with pkgs; [ zlib.dev hdf5.dev ]; + Rhdf5lib = with pkgs; [ zlib.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 ]; @@ -1320,7 +1320,9 @@ let }); Rhdf5lib = old.Rhdf5lib.overrideAttrs (attrs: { - propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.hdf5.dev ]; + propagatedBuildInputs = attrs.propagatedBuildInputs ++ [ pkgs.hdf5_1_10.dev pkgs.libaec ]; + patches = [ ./patches/Rhdf5lib.patch ]; + }); }); }; in |