diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:44:05 -0700 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-03-26 14:44:05 -0700 |
| commit | 767c179a9440293f259433f6e8bf578176927d72 (patch) | |
| tree | 1902b66023b85f0991d78f4f404bdce12ffb7503 /pkgs/applications/editors/rstudio/r-location.patch | |
| parent | 2c8cf45772862e7e2d77086bbaaa6ac0183ea0bf (diff) | |
| parent | 5a2a71f2c2bbefe01f33c8f0542f57b770a065b2 (diff) | |
| download | nixlib-767c179a9440293f259433f6e8bf578176927d72.tar nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.gz nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.bz2 nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.lz nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.xz nixlib-767c179a9440293f259433f6e8bf578176927d72.tar.zst nixlib-767c179a9440293f259433f6e8bf578176927d72.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/applications/editors/rstudio/r-location.patch')
| -rw-r--r-- | pkgs/applications/editors/rstudio/r-location.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/applications/editors/rstudio/r-location.patch b/pkgs/applications/editors/rstudio/r-location.patch new file mode 100644 index 000000000000..a1ec84a5475c --- /dev/null +++ b/pkgs/applications/editors/rstudio/r-location.patch @@ -0,0 +1,24 @@ +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()) + { |