mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-10-03 02:57:30 +03:00
Merge pull request #50964 from mredaelli/rstudio
rstudio: fix qt plugins not found
This commit is contained in:
commit
56cad36f75
@ -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 {
|
stdenv.mkDerivation rec {
|
||||||
|
|
||||||
name = rstudio.name + "-wrapper";
|
name = rstudio.name + "-wrapper";
|
||||||
@ -24,7 +27,8 @@ stdenv.mkDerivation rec {
|
|||||||
echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
|
echo -n $R_LIBS_SITE | sed -e 's/:/", "/g' >> $out/${fixLibsR}
|
||||||
echo -n "\"))" >> $out/${fixLibsR}
|
echo -n "\"))" >> $out/${fixLibsR}
|
||||||
echo >> $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 = {
|
meta = {
|
||||||
|
@ -13148,7 +13148,7 @@ with pkgs;
|
|||||||
packages = [];
|
packages = [];
|
||||||
};
|
};
|
||||||
|
|
||||||
rstudioWrapper = callPackage ../development/r-modules/wrapper-rstudio.nix {
|
rstudioWrapper = libsForQt5.callPackage ../development/r-modules/wrapper-rstudio.nix {
|
||||||
recommendedPackages = with rPackages; [
|
recommendedPackages = with rPackages; [
|
||||||
boot class cluster codetools foreign KernSmooth lattice MASS
|
boot class cluster codetools foreign KernSmooth lattice MASS
|
||||||
Matrix mgcv nlme nnet rpart spatial survival
|
Matrix mgcv nlme nnet rpart spatial survival
|
||||||
|
Loading…
Reference in New Issue
Block a user