b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #31457 from sifmelcara/fix/rstudio-qt-build

Browse source 
rstudio: fix build
This commit is contained in:
Orivej Desh 2017-11-10 00:02:49 +00:00 committed by GitHub
parent c910a08cff 00e1a22348
commit 9725b0f195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 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,5 +1,6 @@
{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl,
R, qt5, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc
{ stdenv, fetchurl, fetchpatch, makeDesktopItem, cmake, boost, zlib, openssl
, R, qtbase, qtwebkit, qtwebchannel, libuuid, hunspellDicts, unzip, ant, jdk
, gnumake, makeWrapper, pandoc
}:
let
@ -12,7 +13,7 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake unzip ant jdk makeWrapper pandoc ];
buildInputs = [ boost zlib openssl R qt5.full qt5.qtwebkit qt5.qtwebchannel libuuid ];
buildInputs = [ boost zlib openssl R qtbase qtwebkit qtwebchannel libuuid ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";