diff options
author | Justin Bedő <cu@cua0.org> | 2024-05-03 17:09:37 +1000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-03 17:09:37 +1000 |
commit | d2dd4864a0f879d312f04a21eb7e0736c47d25aa (patch) | |
tree | 1d6d77181474876b8301819d3c5ff4b4aec5291c | |
parent | 2492d65c9548a2463e63ccfaf9b71ac5dfb811c0 (diff) | |
parent | ec81fe00d90995f7b14fe8823c894fe133015e2f (diff) |
Merge pull request #302192 from Kupac/fix_Rhisat2
rPackages.Rhisat2: fix build
-rw-r--r-- | pkgs/development/r-modules/default.nix | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index f2c398c0f4526..f2af3039b6b51 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -413,6 +413,7 @@ let RcppZiggurat = [ pkgs.gsl ]; reprex = [ pkgs.which ]; rgdal = with pkgs; [ proj.dev gdal ]; + Rhisat2 = [ pkgs.which pkgs.hostname ]; gdalcubes = [ pkgs.pkg-config ]; rgeos = [ pkgs.geos ]; Rglpk = [ pkgs.glpk ]; @@ -1271,6 +1272,17 @@ let ''; }); + # backported patch from 1.9 + Rhisat2= old.Rhisat2.overrideAttrs (attrs: { + patches = [ (pkgs.fetchpatch { + url = "https://github.com/fmicompbio/Rhisat2/commit/a0f27b018831b39f080f99e6db8a4b876fd56fc3.patch"; + sha256 = "sha256-FbYkP/WFmbfQmxArkHgushgVgY0XSypbK8Z5ivQK8k4="; + }) ]; + env = (attrs.env or { }) // { + NIX_CFLAGS_COMPILE = attrs.env.NIX_CFLAGS_COMPILE + " -w"; + }; + }); + s2 = old.s2.overrideAttrs (attrs: { PKGCONFIG_CFLAGS = "-I${pkgs.openssl.dev}/include"; PKGCONFIG_LIBS = "-Wl,-rpath,${lib.getLib pkgs.openssl}/lib -L${lib.getLib pkgs.openssl}/lib -lssl -lcrypto"; |