From 23461f33eb13f9b3e86e8ae02e36109b879b6b51 Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Sun, 20 Jan 2019 15:17:17 +0100 Subject: [PATCH 1/2] rstudio(-preview): fix build --- pkgs/applications/editors/rstudio/default.nix | 7 ++++--- pkgs/applications/editors/rstudio/preview.nix | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 9d8c430630e..86fb972e94c 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost -, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts -, unzip, ant, jdk, gnumake, makeWrapper, pandoc +, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, qtxmlpatterns, libuuid +, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc }: let @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ]; + buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel + qtxmlpatterns libuuid ]; src = fetchFromGitHub { owner = "rstudio"; diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix index 340aeec15e0..d815ee78fff 100644 --- a/pkgs/applications/editors/rstudio/preview.nix +++ b/pkgs/applications/editors/rstudio/preview.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib -, openssl, R, qtbase, qtdeclarative, qtsensors, qtwebengine, qtwebchannel +, openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; - buildInputs = [ boost zlib openssl R qtbase qtdeclarative qtsensors + buildInputs = [ boost zlib openssl R qtbase qtxmlpatterns qtsensors qtwebengine qtwebchannel libuuid ]; src = fetchFromGitHub { From 98fb0ab43022ec1fb80490e792a9e6ae35b6564a Mon Sep 17 00:00:00 2001 From: Averell Dalton Date: Mon, 21 Jan 2019 00:13:26 +0100 Subject: [PATCH 2/2] rstudio-preview: update to current --- pkgs/applications/editors/rstudio/preview.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/rstudio/preview.nix b/pkgs/applications/editors/rstudio/preview.nix index d815ee78fff..55c83ca85a6 100644 --- a/pkgs/applications/editors/rstudio/preview.nix +++ b/pkgs/applications/editors/rstudio/preview.nix @@ -5,7 +5,7 @@ }: let - rev = "f33fb2b2f1"; + rev = "f79330d4"; ginVer = "2.1.2"; gwtVer = "2.8.1"; in