Skip to content

Commit 933242a

Browse files
committed
rstudio: add patch for Boost 1.86
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.
1 parent eb69d60 commit 933242a

File tree

2 files changed

+16
-2
lines changed

2 files changed

+16
-2
lines changed
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
diff --git a/src/cpp/core/json/JsonRpc.cpp b/src/cpp/core/json/JsonRpc.cpp
2+
index d034ffecd7..4b08486517 100644
3+
--- a/src/cpp/core/json/JsonRpc.cpp
4+
+++ b/src/cpp/core/json/JsonRpc.cpp
5+
@@ -193,7 +193,7 @@
6+
7+
bool JsonRpcResponse::hasAfterResponse() const
8+
{
9+
- return afterResponse_;
10+
+ return !afterResponse_.empty();
11+
}
12+
13+

pkgs/applications/editors/rstudio/default.nix

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
fetchFromGitHub,
66
replaceVars,
77
cmake,
8-
boost183,
8+
boost,
99
zlib,
1010
openssl,
1111
R,
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
8585

8686
buildInputs =
8787
[
88-
boost183
88+
boost
8989
zlib
9090
openssl
9191
R
@@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
131131
./ignore-etc-os-release.patch
132132
./dont-yarn-install.patch
133133
./dont-assume-pandoc-in-quarto.patch
134+
./boost-1.86.patch
134135
];
135136

136137
postPatch = ''

0 commit comments

Comments
 (0)