b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #50964 from mredaelli/rstudio

Browse source 
rstudio: fix qt plugins not found
This commit is contained in:
Peter Simons 2018-11-24 16:12:33 +01:00 committed by GitHub
parent 6a7f02d89d 5afe1e7c70
commit 56cad36f75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/development/r-modules/wrapper-rstudio.nix
View file

@ -1,5 +1,8 @@
{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages }:
{ stdenv, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }:
let
qtVersion = with stdenv.lib.versions; "${major qtbase.version}.${minor qtbase.version}";
in
stdenv.mkDerivation rec {
name = rstudio.name + "-wrapper";
@ -24,7 +27,8 @@ stdenv.mkDerivation rec {
echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
echo -n "\"))" >> $out/${fixLibsR}
echo >> $out/${fixLibsR}
makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR}
makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio --set R_PROFILE_USER $out/${fixLibsR} \
--prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins
'';
meta = {

2
pkgs/top-level/all-packages.nix
View file

@ -13148,7 +13148,7 @@ with pkgs;
packages = [];
};
rstudioWrapper = callPackage ../development/r-modules/wrapper-rstudio.nix {
rstudioWrapper = libsForQt5.callPackage ../development/r-modules/wrapper-rstudio.nix {
recommendedPackages = with rPackages; [
boot class cluster codetools foreign KernSmooth lattice MASS
Matrix mgcv nlme nnet rpart spatial survival