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

rstudio: use qt5's mkDerivation (#74381)

Browse Source
This commit is contained in:
Thomas Churchman 2020-02-09 07:44:53 +01:00 committed by GitHub
parent f9735f05ac
commit c32ccccd9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 , 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
}: }:
with stdenv.lib; with lib;
let let
verMajor = "1"; verMajor = "1";
verMinor = "2"; verMinor = "2";
@ -13,7 +13,7 @@ let
ginVer = "2.1.2"; ginVer = "2.1.2";
gwtVer = "2.8.1"; gwtVer = "2.8.1";
in in
stdenv.mkDerivation rec { mkDerivation rec {
pname = "RStudio"; pname = "RStudio";
inherit version; 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;"; 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 = '' postInstall = ''
wrapProgram $out/bin/rstudio --suffix PATH : ${gnumake}/bin
mkdir $out/share mkdir $out/share
cp -r ${desktopItem}/share/applications $out/share cp -r ${desktopItem}/share/applications $out/share
mkdir $out/share/icons mkdir $out/share/icons
ln $out/rstudio.png $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"; { description = "Set of integrated tools for the R language";
homepage = https://www.rstudio.com/; homepage = https://www.rstudio.com/;
license = licenses.agpl3; license = licenses.agpl3;