Skip to content

Commit

Permalink
Complete the matrixFix2
Browse files Browse the repository at this point in the history
  • Loading branch information
RensDofferhoff committed Nov 29, 2023
1 parent 1fc9af9 commit 8d21882
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions Modules/install-jaspBase.R.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,15 @@ if (md5SumsChanged(modulePkg, moduleLibrary)) {
writeMd5Sums(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")
}
if (!@IS_FLATPAK_USED@) {

if (Sys.info()["sysname"] == "Darwin")
options(pkgType = "source")

renv::install("Matrix", library = moduleLibrary, prompt = prompt)
renv::install("Matrix", library = moduleLibrary, prompt = prompt)
}
}

# Converting the absolute symlinks to relative symlinks on macOS
Expand Down

0 comments on commit 8d21882

Please sign in to comment.