diff options
| author | Joachim F <joachifm@users.noreply.github.com> | 2019-01-21 19:35:53 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-21 19:35:53 +0000 |
| commit | 592e2ae201d3c58af829a24ec64dce0c9b65f441 (patch) | |
| tree | e20bb71c82184b1960b8ad5c93f0356bfbaeb9d0 /pkgs/applications | |
| parent | 4bbd4243f5eee1151dae795b9f423211ea9dc543 (diff) | |
| parent | 98fb0ab43022ec1fb80490e792a9e6ae35b6564a (diff) | |
Merge pull request #54391 from averelld/rstudio-fixes
Rstudio fixes
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/applications/editors/rstudio/preview.nix | 6 |
2 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 9d8c430630e5b..86fb972e94c3b 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 340aeec15e0fc..55c83ca85a643 100644 --- a/pkgs/applications/editors/rstudio/preview.nix +++ b/pkgs/applications/editors/rstudio/preview.nix @@ -1,11 +1,11 @@ { 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 }: let - rev = "f33fb2b2f1"; + rev = "f79330d4"; ginVer = "2.1.2"; gwtVer = "2.8.1"; in @@ -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 { |