mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-04 21:03:15 +00:00
25 lines
1.0 KiB
Diff
25 lines
1.0 KiB
Diff
|
diff -ur rstudio-0.98.110-old/src/cpp/core/CMakeLists.txt rstudio-0.98.110-new/src/cpp/core/CMakeLists.txt
|
||
|
|
--- rstudio-0.98.110-old/src/cpp/core/r_util/REnvironmentPosix.cpp 2013-04-28 10:02:14.000000000 -0400
|
||
|
|
+++ rstudio-0.98.110-new/src/cpp/core/r_util/REnvironmentPosix.cpp 2015-03-23 15:06:35.533400807 -0400
|
||
|
|
@@ -84,9 +84,7 @@
|
||
|
|
{
|
||
|
|
// define potential paths
|
||
|
|
std::vector<std::string> rScriptPaths;
|
||
|
|
- rScriptPaths.push_back("/usr/bin/R");
|
||
|
|
- rScriptPaths.push_back("/usr/local/bin/R");
|
||
|
|
- rScriptPaths.push_back("/opt/local/bin/R");
|
||
|
|
+ rScriptPaths.push_back("@R@/bin/R");
|
||
|
|
return scanForRScript(rScriptPaths, pErrMsg);
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -220,8 +218,7 @@
|
||
|
|
// scan in standard locations as a fallback
|
||
|
|
std::string scanErrMsg;
|
||
|
|
std::vector<std::string> rScriptPaths;
|
||
|
|
- rScriptPaths.push_back("/usr/local/bin/R");
|
||
|
|
- rScriptPaths.push_back("/usr/bin/R");
|
||
|
|
+ rScriptPaths.push_back("@R@/bin/R");
|
||
|
|
FilePath scriptPath = scanForRScript(rScriptPaths, &scanErrMsg);
|
||
|
|
if (scriptPath.empty())
|
||
|
|
{
|