Merge pull request #300557 from Kupac/fix_universalmotif

rPackages.universalmotif: fix build
This commit is contained in:
Justin Bedő 2024-04-01 22:26:51 +11:00 committed by GitHub
commit 8371418808
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 0 deletions

View File

@ -1210,6 +1210,10 @@ let
];
});
universalmotif = old.universalmotif.overrideAttrs (attrs: {
patches = [ ./patches/universalmotif.patch];
});
V8 = old.V8.overrideAttrs (attrs: {
postPatch = ''
substituteInPlace configure \

View File

@ -0,0 +1,10 @@
diff --git a/src/Makevars b/src/Makevars
index 6e08950..e66fbbd 100644
--- a/src/Makevars
+++ b/src/Makevars
@@ -1,5 +1 @@
CXX_STD=CXX11
-PKG_LIBS=`"$(R_HOME)/bin/Rscript" -e "RcppThread::LdFlags()"`
-strippedLib: $(SHLIB)
- if test -e "/usr/bin/strip" & test -e "/bin/uname" & [[ `uname` == "Linux" ]] ; then /usr/bin/strip --strip-debug $(SHLIB); fi
-.phony: strippedLib