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.
This commit is contained in:
parent
eb69d60f11
commit
933242a56f
13
pkgs/applications/editors/rstudio/boost-1.86.patch
Normal file
13
pkgs/applications/editors/rstudio/boost-1.86.patch
Normal file
@ -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();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -5,7 +5,7 @@
|
|||||||
fetchFromGitHub,
|
fetchFromGitHub,
|
||||||
replaceVars,
|
replaceVars,
|
||||||
cmake,
|
cmake,
|
||||||
boost183,
|
boost,
|
||||||
zlib,
|
zlib,
|
||||||
openssl,
|
openssl,
|
||||||
R,
|
R,
|
||||||
@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
|
|||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[
|
[
|
||||||
boost183
|
boost
|
||||||
zlib
|
zlib
|
||||||
openssl
|
openssl
|
||||||
R
|
R
|
||||||
@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
|
|||||||
./ignore-etc-os-release.patch
|
./ignore-etc-os-release.patch
|
||||||
./dont-yarn-install.patch
|
./dont-yarn-install.patch
|
||||||
./dont-assume-pandoc-in-quarto.patch
|
./dont-assume-pandoc-in-quarto.patch
|
||||||
|
./boost-1.86.patch
|
||||||
];
|
];
|
||||||
|
|
||||||
postPatch = ''
|
postPatch = ''
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user