1f95c49331
rstudio: 1.4.1717 -> 2022.02.3+492 The old version does not compile with gcc11. Also the used nixos-22.05 libraries (R interpreter) have changed their interfaces that have to be also patched. Updating RStudio is useful. * Remove Quarto patch Follow review in https://github.com/NixOS/nixpkgs/pull/177021#pullrequestreview-1007625773 * Fix not FHS paths Create explicit nix path replacement of hard coded FHS paths for pandoc and nodejs.
19 lines
646 B
Diff
19 lines
646 B
Diff
--- a/src/cpp/desktop/DesktopOptions.cpp
|
|
+++ b/src/cpp/desktop/DesktopOptions.cpp
|
|
@@ -499,15 +499,9 @@
|
|
{
|
|
if (resourcesPath_.isEmpty())
|
|
{
|
|
-#ifdef RSTUDIO_PACKAGE_BUILD
|
|
// release configuration: the 'resources' folder is
|
|
// part of the supporting files folder
|
|
- resourcesPath_ = supportingFilePath().completePath("resources");
|
|
-#else
|
|
- // developer configuration: the 'resources' folder is
|
|
- // a sibling of the RStudio executable
|
|
- resourcesPath_ = scriptsPath().completePath("resources");
|
|
-#endif
|
|
+ resourcesPath_ = supportingFilePath().completePath("resources");
|
|
}
|
|
|
|
return resourcesPath_;
|