From 64e7831b35d82e1f5d79a2f4329b741756e7fe19 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 19 Dec 2024 00:26:01 +0100
Subject: [PATCH] rstudioWrapper: don't wrap with QT anymore

---
 pkgs/development/r-modules/wrapper-rstudio.nix | 5 ++---
 pkgs/top-level/all-packages.nix                | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/r-modules/wrapper-rstudio.nix b/pkgs/development/r-modules/wrapper-rstudio.nix
index 3c85657141d16..35bfcbb99f7b1 100644
--- 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
index 460225825c5d3..0a8c209a324fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11140,7 +11140,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