rstudio: add patch for Boost 1.86 (NixOS#370391)

tjni · Jan 15, 2025 · 8b38173 · 8b38173
2 parents 42679b9 + 933242a
commit 8b38173
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/pkgs/applications/editors/rstudio/boost-1.86.patch b/pkgs/applications/editors/rstudio/boost-1.86.patch
@@ -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();
+ }
+
+
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
@@ -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 = ''