summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rw-r--r--rlibrary.patch13
3 files changed, 15 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 3c748afb3f0..7cff25eedb2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Sun Jun 4 21:09:38 UTC 2017
+# Sun Jul 2 20:38:32 UTC 2017
pkgbase = jasp-desktop-git
pkgdesc = JASP, a low fat alternative to SPSS, a delicious alternative to R.
pkgver = v0.8.1.2.r0.g7401fa07
diff --git a/PKGBUILD b/PKGBUILD
index cbd01a7a37a..9fd0b4aeb7e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -33,7 +33,7 @@ prepare() {
cd $srcdir/$_buildname
echo "Creating Makefile"
- qmake R_HOME=/usr/lib/R PREFIX=/usr ../$_pkgname
+ qmake PREFIX=/usr ../$_pkgname
}
build() {
diff --git a/rlibrary.patch b/rlibrary.patch
new file mode 100644
index 00000000000..3621dabb74b
--- /dev/null
+++ b/rlibrary.patch
@@ -0,0 +1,13 @@
+diff --git a/JASP-Desktop/enginesync.cpp b/JASP-Desktop/enginesync.cpp
+index 49e215b..a87db98 100644
+--- a/JASP-Desktop/enginesync.cpp
++++ b/JASP-Desktop/enginesync.cpp
+@@ -408,7 +408,7 @@ void EngineSync::startSlaveProcess(int no)
+
+ env.insert("LD_LIBRARY_PATH", rHome.absoluteFilePath("lib") + ";" + rHome.absoluteFilePath("library/RInside/lib") + ";" + rHome.absoluteFilePath("library/Rcpp/lib") + ";" + rHome.absoluteFilePath("site-library/RInside/lib") + ";" + rHome.absoluteFilePath("site-library/Rcpp/lib"));
+ env.insert("R_HOME", rHome.absolutePath());
+- env.insert("R_LIBS", programDir.absoluteFilePath("R/library") + ":" + rHome.absoluteFilePath("library") + ":" + rHome.absoluteFilePath("site-library"));
++ env.insert("R_LIBS", programDir.absoluteFilePath("R/library") + ":" + rHome.absoluteFilePath("library") + ":" + rHome.absoluteFilePath("site-library") + ":/usr/share/jasp-desktop/R/library");
+
+ #endif
+