Skip to content

Commit

Permalink
always install matrix when installing jaspBase (#5326)
Browse files Browse the repository at this point in the history
  • Loading branch information
RensDofferhoff authored and JorisGoosen committed Nov 29, 2023
1 parent 8252e79 commit 3b4869d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Modules/install-jaspBase.R.in
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ 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@) {
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")
}

0 comments on commit 3b4869d

Please sign in to comment.