diff options
| author | Alex Branham <alex.branham@gmail.com> | 2020-04-28 20:25:10 -0400 |
|---|---|---|
| committer | Alex Branham <alex.branham@gmail.com> | 2020-04-28 20:59:45 -0400 |
| commit | 56be910cd3876d7f4d866c6b11320865df60a5d4 (patch) | |
| tree | e6978cde7c3d03b03a80c5f02ba40613b3415fc8 /pkgs/applications/editors/rstudio | |
| parent | cb1a13ad98779cfaac8b7d25857d8945c8233c22 (diff) | |
Rstudio: 1.2.5033 -> 1.2.5042
Need the patch to backport a fix so Rstudio compiles against R 4.0.0
Diffstat (limited to 'pkgs/applications/editors/rstudio')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index d429bb4bcbbf..3fe845a067b3 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,4 +1,4 @@ -{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +{ lib, mkDerivation, fetchurl, fetchpatch, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib , openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages @@ -8,7 +8,7 @@ with lib; let verMajor = "1"; verMinor = "2"; - verPatch = "5033"; + verPatch = "5042"; version = "${verMajor}.${verMinor}.${verPatch}"; ginVer = "2.1.2"; gwtVer = "2.8.1"; @@ -26,11 +26,19 @@ mkDerivation rec { owner = "rstudio"; repo = "rstudio"; rev = "v${version}"; - sha256 = "0f3p2anz9xay2859bxj3bvyj582igsp628qxsccpkgn0jifvi4np"; + sha256 = "1n67fa357v51j3z1ma8v2ydfsx3y8n10k2svmfcf4mdzsi8w0kc5"; }; # Hack RStudio to only use the input R and provided libclang. - patches = [ ./r-location.patch ./clang-location.patch ]; + patches = [ ./r-location.patch ./clang-location.patch + (fetchpatch { + # Fetch a patch to ensure Rstudio compiles against R + # 4.0.0, should be removed next 1.2.X Rstudio update + # or possibly 1.3.X + url = "https://github.com/rstudio/rstudio/commit/3fb2397c2f208bb8ace0bbaf269481ccb96b5b20.patch"; + sha256 = "0qpgjy6aash0fc0xbns42cwpj3nsw49nkbzwyq8az01xwg81g0f3"; + }) + ]; postPatch = '' substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace '@R@' ${R} substituteInPlace src/cpp/core/libclang/LibClang.cpp \ |