ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-28 14:22:50 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54391 from averelld/rstudio-fixes

Browse Source 
Rstudio fixes
This commit is contained in:
Joachim F 2019-01-21 19:35:53 +00:00 committed by GitHub
commit 592e2ae201
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 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";

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

@ -1,11 +1,11 @@
{ 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
}: }:
let let
rev = "f33fb2b2f1"; rev = "f79330d4";
ginVer = "2.1.2"; ginVer = "2.1.2";
gwtVer = "2.8.1"; gwtVer = "2.8.1";
in in
@ -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 {