diff options
| author | Averell Dalton <averell+nixpkgs@rxd4.com> | 2019-01-20 15:17:17 +0100 |
|---|---|---|
| committer | Averell Dalton <averell+nixpkgs@rxd4.com> | 2019-01-21 00:41:58 +0100 |
| commit | 23461f33eb13f9b3e86e8ae02e36109b879b6b51 (patch) | |
| tree | 403f937cf8189ece42db282978488860094486c4 /pkgs/applications/editors/rstudio | |
| parent | 2b0efd5c5ae36204dfe745b109f6a3baa99210c2 (diff) | |
rstudio(-preview): fix build
Diffstat (limited to 'pkgs/applications/editors/rstudio')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 7 | ||||
| -rw-r--r-- | 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 9d8c430630e5..86fb972e94c3 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 340aeec15e0f..d815ee78fff5 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 { |