Merge pull request #303210 from Kupac/fix_FLAMES
rPackages.FLAMES: fix build
This commit is contained in:
commit
90d0d40c04
|
@ -662,7 +662,7 @@ let
|
||||||
rGEDI = with pkgs; [ libgeotiff.dev libaec zlib.dev hdf5.dev ];
|
rGEDI = with pkgs; [ libgeotiff.dev libaec zlib.dev hdf5.dev ];
|
||||||
rawrr = [ pkgs.mono ];
|
rawrr = [ pkgs.mono ];
|
||||||
HDF5Array = [ pkgs.zlib.dev ];
|
HDF5Array = [ pkgs.zlib.dev ];
|
||||||
FLAMES = [ pkgs.zlib.dev ];
|
FLAMES = with pkgs; [ zlib.dev bzip2.dev xz.dev ];
|
||||||
ncdfFlow = [ pkgs.zlib.dev ];
|
ncdfFlow = [ pkgs.zlib.dev ];
|
||||||
proj4 = [ pkgs.proj.dev ];
|
proj4 = [ pkgs.proj.dev ];
|
||||||
rtmpt = [ pkgs.gsl ];
|
rtmpt = [ pkgs.gsl ];
|
||||||
|
@ -1215,6 +1215,10 @@ let
|
||||||
patches = [ ./patches/spMC.patch ];
|
patches = [ ./patches/spMC.patch ];
|
||||||
});
|
});
|
||||||
|
|
||||||
|
FLAMES = old.FLAMES.overrideAttrs (attrs: {
|
||||||
|
patches = [ ./patches/FLAMES.patch ];
|
||||||
|
});
|
||||||
|
|
||||||
openssl = old.openssl.overrideAttrs (attrs: {
|
openssl = old.openssl.overrideAttrs (attrs: {
|
||||||
preConfigure = ''
|
preConfigure = ''
|
||||||
patchShebangs configure
|
patchShebangs configure
|
||||||
|
|
17
pkgs/development/r-modules/patches/FLAMES.patch
Normal file
17
pkgs/development/r-modules/patches/FLAMES.patch
Normal 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 \
|
Loading…
Reference in New Issue
Block a user