diff options
| author | Peter Simons <simons@cryp.to> | 2018-11-24 16:12:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-24 16:12:33 +0100 |
| commit | 56cad36f7541dfb906b1ecc8858c73da4fbd1010 (patch) | |
| tree | 7abf5ca631e00eec762f7fb9a408476bcdaf8844 /pkgs | |
| parent | 6a7f02d89debadceaddd91ea3b9deb059597a927 (diff) | |
| parent | 5afe1e7c708a0ea7fbc87185ca8ac15f2d52b8ce (diff) | |
| download | nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.tar nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.tar.gz nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.tar.bz2 nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.tar.lz nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.tar.xz nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.tar.zst nixpkgs-56cad36f7541dfb906b1ecc8858c73da4fbd1010.zip | |
Merge pull request #50964 from mredaelli/rstudio
rstudio: fix qt plugins not found
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/development/r-modules/wrapper-rstudio.nix | 8 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index dd9b0e9c538..8ad3a103c93 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -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 = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd4b4512d8a..54dedf8eb9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 |