From d0d953d910913e50f4246519597cbd86908f29db Mon Sep 17 00:00:00 2001 From: mucaho Date: Sun, 25 Oct 2015 16:18:21 +0100 Subject: rstudio: add run-time dependency gnumake fixes #9163. --- pkgs/applications/editors/rstudio/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/applications/editors/rstudio') 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/; -- cgit 1.4.1