diff options
| author | superherointj <5861043+superherointj@users.noreply.github.com> | 2024-04-12 11:19:46 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-12 11:19:46 -0300 |
| commit | 90d0d40c04ff788a34d1e9d614b7a07ecb01377d (patch) | |
| tree | 8bc2d0f7f088802478e152d84522621daebf6386 | |
| parent | 5093b19326a75c55d6e679734aa3335a402f2af3 (diff) | |
| parent | 8628dda9b98fdd31e00afef07f664bb40d01869f (diff) | |
Merge pull request #303210 from Kupac/fix_FLAMES
rPackages.FLAMES: fix build
| -rw-r--r-- | pkgs/development/r-modules/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/development/r-modules/patches/FLAMES.patch | 17 |
2 files changed, 22 insertions, 1 deletions
diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 097ffdcee96fe..49bc3417f36cc 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -662,7 +662,7 @@ let rGEDI = with pkgs; [ libgeotiff.dev libaec zlib.dev hdf5.dev ]; rawrr = [ pkgs.mono ]; HDF5Array = [ pkgs.zlib.dev ]; - FLAMES = [ pkgs.zlib.dev ]; + FLAMES = with pkgs; [ zlib.dev bzip2.dev xz.dev ]; ncdfFlow = [ pkgs.zlib.dev ]; proj4 = [ pkgs.proj.dev ]; rtmpt = [ pkgs.gsl ]; @@ -1215,6 +1215,10 @@ let patches = [ ./patches/spMC.patch ]; }); + FLAMES = old.FLAMES.overrideAttrs (attrs: { + patches = [ ./patches/FLAMES.patch ]; + }); + openssl = old.openssl.overrideAttrs (attrs: { preConfigure = '' patchShebangs configure diff --git a/pkgs/development/r-modules/patches/FLAMES.patch b/pkgs/development/r-modules/patches/FLAMES.patch new file mode 100644 index 0000000000000..334ea5156f9af --- /dev/null +++ b/pkgs/development/r-modules/patches/FLAMES.patch @@ -0,0 +1,17 @@ +diff --git a/src/Makevars b/src/Makevars +index 4f3fa42ce752..e48e45561292 100755 +--- a/src/Makevars ++++ b/src/Makevars +@@ -24,12 +24,6 @@ FILES = $(CFILES) $(CPPFILES) + SOURCES = $(FILES) + OBJECTS = $(CPPFILES:.cpp=.o) $(CFILES:.c=.o) + +-strippedLib: $(SHLIB) +- if test -e "/usr/bin/strip" & test -e "/bin/uname" & [[ `uname` == "Linux" ]] ; then /usr/bin/strip --strip-debug $(SHLIB); fi +-clean: +- rm $(OBJECTS) +-.phony: strippedLib clean +- + RHTSLIB_LIBS=$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e \ + 'Rhtslib::pkgconfig("PKG_LIBS")') + RHTSLIB_CPPFLAGS=$(shell "${R_HOME}/bin${R_ARCH_BIN}/Rscript" -e \ |