mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-23 06:03:40 +00:00
20 lines
646 B
Diff
20 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_;
|