diff options
| author | mucaho <mkucko@gmail.com> | 2015-10-25 16:18:21 +0100 |
|---|---|---|
| committer | mucaho <mkucko@gmail.com> | 2015-10-25 16:18:21 +0100 |
| commit | d0d953d910913e50f4246519597cbd86908f29db (patch) | |
| tree | 66eb648fecc0fd8a22d6e72ad41fd3a893046067 /pkgs/applications/editors/rstudio | |
| parent | 60d407b2094cd718b86de1360c9a44d92638d182 (diff) | |
| download | nixlib-d0d953d910913e50f4246519597cbd86908f29db.tar nixlib-d0d953d910913e50f4246519597cbd86908f29db.tar.gz nixlib-d0d953d910913e50f4246519597cbd86908f29db.tar.bz2 nixlib-d0d953d910913e50f4246519597cbd86908f29db.tar.lz nixlib-d0d953d910913e50f4246519597cbd86908f29db.tar.xz nixlib-d0d953d910913e50f4246519597cbd86908f29db.tar.zst nixlib-d0d953d910913e50f4246519597cbd86908f29db.zip | |
rstudio: add run-time dependency gnumake
fixes #9163.
Diffstat (limited to 'pkgs/applications/editors/rstudio')
| -rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index fda51dc24019..8f0c560f47d1 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -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/; |