Skip to content

Commit

Permalink
rstudio: add patch for Boost 1.86
Browse files Browse the repository at this point in the history
I’m not going to bother trying to upstream this trivial fix since
they want full copyright assignment and a mailing address; it’s less
work for both parties for them to rederive it from scratch if and
when they get around to updating Boost themselves.
  • Loading branch information
emilazy committed Jan 2, 2025
1 parent ab06582 commit dce6f7d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 3 deletions.
13 changes: 13 additions & 0 deletions pkgs/applications/editors/rstudio/boost-1.86.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp
index d034ffecd7..4b08486517 100644
--- a/src/cpp/core/json/JsonRpc.cpp
+++ b/src/cpp/core/json/JsonRpc.cpp
@@ -193,7 +193,7 @@

bool JsonRpcResponse::hasAfterResponse() const
{
- return afterResponse_;
+ return !afterResponse_.empty();
}


9 changes: 6 additions & 3 deletions pkgs/applications/editors/rstudio/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
, makeDesktopItem
, copyDesktopItems
, cmake
, boost183
, boost
, zlib
, openssl
, R
Expand Down Expand Up @@ -91,7 +91,7 @@ in
];

buildInputs = [
boost183
boost
zlib
openssl
R
Expand Down Expand Up @@ -124,8 +124,11 @@ in
"-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
];

# Hack RStudio to only use the input R and provided libclang.
patches = [
# Fix build with Boost 1.86
./boost-1.86.patch

# Hack RStudio to only use the input R and provided libclang.
./r-location.patch
./clang-location.patch
./use-system-node.patch
Expand Down

0 comments on commit dce6f7d

Please sign in to comment.