From 20a98dbbdd6c025da62dd3cdd144c1992cb85125 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. No other package requires Boost 1.83 at this point. --- pkgs/applications/editors/rstudio/boost-1.86.patch | 13 +++++++++++++ pkgs/applications/editors/rstudio/default.nix | 9 ++++++--- 2 files changed, 19 insertions(+), 3 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 00000000000000..ca7ca648e5b670 --- /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 ff0c468fc509d1..b1ca0fefd27c73 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -6,7 +6,7 @@ , makeDesktopItem , copyDesktopItems , cmake -, boost183 +, boost , zlib , openssl , R @@ -91,7 +91,7 @@ in ]; buildInputs = [ - boost183 + boost zlib openssl R @@ -124,8 +124,11 @@ in "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake" ]; - # Hack RStudio to only use the input R and provided libclang. patches = [ + # Fix build with Boost 1.86 + ./boost-1.86.patch + + # Hack RStudio to only use the input R and provided libclang. ./r-location.patch ./clang-location.patch ./use-system-node.patch