rstudioWrapper: don't wrap with QT anymore

NixOS · Jan 10, 2025 · 904ffd6 · 904ffd6
1 parent ac12737
commit 904ffd6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
@@ -3,7 +3,6 @@
   R,
   rstudio,
   makeWrapper,
-  wrapQtAppsHook,
   recommendedPackages,
   packages,
   fontconfig,
@@ -14,7 +13,7 @@ runCommand (rstudio.name + "-wrapper")
     preferLocalBuild = true;
     allowSubstitutes = false;
 
-    nativeBuildInputs = [ (if rstudio.server then makeWrapper else wrapQtAppsHook) ];
+    nativeBuildInputs = [ makeWrapper ];
     dontWrapQtApps = true;
 
     buildInputs =
@@ -56,7 +55,7 @@ runCommand (rstudio.name + "-wrapper")
       else
         ''
           ln -s ${rstudio}/share $out
-          makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \
+          makeWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \
             --set R_PROFILE_USER $out/$fixLibsR
         ''
     )

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -11280,7 +11280,7 @@ with pkgs;
     wrapR = false;
   };
 
-  rstudioWrapper = libsForQt5.callPackage ../development/r-modules/wrapper-rstudio.nix {
+  rstudioWrapper = 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