Commit 933242a5 authored by Emily's avatar Emily
Browse files

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.
parent eb69d60f
Loading
Loading
Loading
Loading
+13 −0
Original line number Diff line number Diff line
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();
 }
    
    
+3 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@
  fetchFromGitHub,
  replaceVars,
  cmake,
  boost183,
  boost,
  zlib,
  openssl,
  R,
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {

  buildInputs =
    [
      boost183
      boost
      zlib
      openssl
      R
@@ -131,6 +131,7 @@ stdenv.mkDerivation rec {
    ./ignore-etc-os-release.patch
    ./dont-yarn-install.patch
    ./dont-assume-pandoc-in-quarto.patch
    ./boost-1.86.patch
  ];

  postPatch = ''