public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rstudio(-preview): fix build

Browse Source
This commit is contained in:
Averell Dalton 2019-01-20 15:17:17 +01:00
parent 2b0efd5c5a
commit 23461f33eb
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/applications/editors/rstudio/default.nix
View File

@ -1,6 +1,6 @@
{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost { stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost
, zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts , zlib, openssl, R, qtbase, qtwebkit, qtwebchannel, qtxmlpatterns, libuuid
, unzip, ant, jdk, gnumake, makeWrapper, pandoc , hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
}: }:
let let
@ -16,7 +16,8 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; 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 { src = fetchFromGitHub {
owner = "rstudio"; owner = "rstudio";

4
pkgs/applications/editors/rstudio/preview.nix
View File

@ -1,5 +1,5 @@
{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib { 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 , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
, llvmPackages , llvmPackages
}: }:
@ -14,7 +14,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ]; 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 ]; qtwebengine qtwebchannel libuuid ];
src = fetchFromGitHub { src = fetchFromGitHub {