From 933242a56fe7f1e673dafffcbf24d48cd90b67b7 Mon Sep 17 00:00:00 2001 From: Emily Date: Thu, 2 Jan 2025 21:45:02 +0000 Subject: [PATCH] rstudio: add patch for Boost 1.86 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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. --- pkgs/applications/editors/rstudio/boost-1.86.patch | 13 +++++++++++++ pkgs/applications/editors/rstudio/default.nix | 5 +++-- 2 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/editors/rstudio/boost-1.86.patch diff --git a/pkgs/applications/editors/rstudio/boost-1.86.patch b/pkgs/applications/editors/rstudio/boost-1.86.patch new file mode 100644 index 0000000000000..ca7ca648e5b67 --- /dev/null +++ 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 index 867742d3b7853..4df8046de30fe 100644 --- 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 = ''