colin
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #303210 from Kupac/fix_FLAMES 

rPackages.FLAMES: fix build
This commit is contained in:
superherointj 2024-04-12 11:19:46 -03:00 committed by GitHub
parent 5093b19326 8628dda9b9
commit 90d0d40c04
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/r-modules/default.nix
View File

@ -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

17
pkgs/development/r-modules/patches/FLAMES.patch Normal file
View File

@ -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 \