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

rstudio: add run-time dependency gnumake

Browse Source 
fixes #9163.
This commit is contained in:
mucaho 2015-10-25 16:18:21 +01:00
parent 60d407b209
commit d0d953d910
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk }:
{ stdenv, fetchurl, cmake, boost155, zlib, openssl, R, qt4, libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper }:
let
version = "0.98.110";
@ -8,7 +8,7 @@ in
stdenv.mkDerivation {
name = "RStudio-${version}";
buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk ];
buildInputs = [ cmake boost155 zlib openssl R qt4 libuuid unzip ant jdk makeWrapper ];
src = fetchurl {
url = "https://github.com/rstudio/rstudio/archive/v${version}.tar.gz";
@ -61,6 +61,10 @@ stdenv.mkDerivation {
cmakeFlags = [ "-DRSTUDIO_TARGET=Desktop" ];
postInstall = ''
wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
'';
meta = with stdenv.lib;
{ description = "Set of integrated tools for the R language";
homepage = http://www.rstudio.com/;