always install matrix when installing jaspBase (#5326) (#5332)

* always install matrix when installing jaspBase (#5326) * install Matix from source on macos, requires gfortran to be installed on the local system --------- Co-authored-by: RensDofferhoff <[email protected]>
jasp-stats · Nov 29, 2023 · c241254 · c241254
1 parent 8252e79
commit c241254
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/Modules/install-jaspBase.R.in b/Modules/install-jaspBase.R.in
@@ -47,15 +47,20 @@ if (md5SumsChanged(modulePkg, moduleLibrary)) {
 
 }
 
+#This is necessary because of conflicts with Matrix dep of base R lib.
+#Can be removed when a new version of R updates its Matrix
+if (!@IS_FLATPAK_USED@) {
+
+  if (Sys.info()["sysname"] == "Darwin") { 
+    options(pkgType = "source")
+  }  
+
+	renv::install("Matrix", library = moduleLibrary, prompt = prompt)
+}
+
 # Converting the absolute symlinks to relative symlinks on macOS
 # Todo, I can do this using CMake like I do on Windows
 if (Sys.info()["sysname"] == "Darwin") {  
   source('@MODULES_BINARY_PATH@/symlinkTools.R')
   convertAbsoluteSymlinksToRelative('@R_LIBRARY_PATH@', '@MODULES_RENV_CACHE_PATH@')
 }
-
-#This is necessary because of conflicts with Matrix dep of base R lib.
-#Can be removed when a new version of R updates its Matrix
-if (@IS_LINUX_LOCAL_BUILD@) {
-	renv::install("Matrix", type="source")
-}