diff options
| author | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
|---|---|---|
| committer | Thomas Tuegel <ttuegel@mailbox.org> | 2019-07-05 10:42:08 -0500 |
| commit | 51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2 (patch) | |
| tree | 0b9751f2bfd16a70e406b420c34a8d4097ad9492 /pkgs/development/r-modules | |
| parent | f79fd2e826dd95b3b64839d3e0bec8ae1dfab17e (diff) | |
| download | nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.gz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.bz2 nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.lz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.xz nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.tar.zst nixpkgs-51d78034a1db78f8ce0ea3ba6fa20be590ed0ca2.zip | |
wrapQtAppsHook: Remove ad hoc Qt wrappers
Diffstat (limited to 'pkgs/development/r-modules')
| -rw-r--r-- | pkgs/development/r-modules/wrapper-rstudio.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix index c89773c2dd5..5eeac8fed30 100644 --- a/pkgs/development/r-modules/wrapper-rstudio.nix +++ b/pkgs/development/r-modules/wrapper-rstudio.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, R, rstudio, makeWrapper, recommendedPackages, packages, qtbase }: +{ lib, runCommand, R, rstudio, wrapQtAppsHook, recommendedPackages, packages, qtbase }: let qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}"; @@ -7,7 +7,8 @@ runCommand (rstudio.name + "-wrapper") { preferLocalBuild = true; allowSubstitutes = false; - nativeBuildInputs = [makeWrapper]; + nativeBuildInputs = [wrapQtAppsHook]; + dontWrapQtApps = true; buildInputs = [R rstudio] ++ recommendedPackages ++ packages; @@ -29,6 +30,6 @@ echo -n ".libPaths(c(.libPaths(), \"" >> $out/$fixLibsR 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 \ - --prefix QT_PLUGIN_PATH : ${qtbase}/lib/qt-${qtVersion}/plugins +makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \ + --set R_PROFILE_USER $out/$fixLibsR '' |