diff options
author | Thomas Churchman <thomas@kepow.org> | 2020-02-09 07:44:53 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-09 01:44:53 -0500 |
commit | c32ccccd9d28106802b7be432bcce78b3d4f2bd1 (patch) | |
tree | 9d07ee6e883989a1cf950b248d00f7a0b65e21ff /pkgs/applications/editors/rstudio | |
parent | f9735f05acb6c59fe3c7e2b103c1b34b92b0df3a (diff) |
rstudio: use qt5's mkDerivation (#74381)
Diffstat (limited to 'pkgs/applications/editors/rstudio')
-rw-r--r-- | pkgs/applications/editors/rstudio/default.nix | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix index 933644cc47176..cab7ac119b6a6 100644 --- a/pkgs/applications/editors/rstudio/default.nix +++ b/pkgs/applications/editors/rstudio/default.nix @@ -1,10 +1,10 @@ -{ stdenv, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib +{ lib, mkDerivation, fetchurl, fetchFromGitHub, makeDesktopItem, cmake, boost, zlib , openssl, R, qtbase, qtxmlpatterns, qtsensors, qtwebengine, qtwebchannel , libuuid, hunspellDicts, unzip, ant, jdk, gnumake, makeWrapper, pandoc , llvmPackages }: -with stdenv.lib; +with lib; let verMajor = "1"; verMinor = "2"; @@ -13,7 +13,7 @@ let ginVer = "2.1.2"; gwtVer = "2.8.1"; in -stdenv.mkDerivation rec { +mkDerivation rec { pname = "RStudio"; inherit version; @@ -116,15 +116,16 @@ stdenv.mkDerivation rec { mimeType = "text/x-r-source;text/x-r;text/x-R;text/x-r-doc;text/x-r-sweave;text/x-r-markdown;text/x-r-html;text/x-r-presentation;application/x-r-data;application/x-r-project;text/x-r-history;text/x-r-profile;text/x-tex;text/x-markdown;text/html;text/css;text/javascript;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;"; }; + qtWrapperArgs = [ ''--suffix PATH : ${gnumake}/bin'' ]; + postInstall = '' - wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin mkdir $out/share cp -r ${desktopItem}/share/applications $out/share mkdir $out/share/icons ln $out/rstudio.png $out/share/icons ''; - meta = with stdenv.lib; + meta = with lib; { description = "Set of integrated tools for the R language"; homepage = https://www.rstudio.com/; license = licenses.agpl3; |