rstudio: don't use libsForQt5.callPackage

NixOS · Dec 5, 2024 · 12c54fe · 12c54fe
1 parent 77872ee
commit 12c54fe
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchurl,
   fetchFromGitHub,
   makeDesktopItem,
@@ -11,11 +10,7 @@
   zlib,
   openssl,
   R,
-  qtbase,
-  qtxmlpatterns,
-  qtsensors,
-  qtwebengine,
-  qtwebchannel,
+  libsForQt5,
   quarto,
   libuuid,
   hunspellDicts,
@@ -29,7 +24,6 @@
   soci,
   postgresql,
   nodejs,
-  qmake,
   server ? false, # build server version
   sqlite,
   pam,
@@ -74,7 +68,7 @@ let
 
   description = "Set of integrated tools for the R language";
 in
-(if server then stdenv.mkDerivation else mkDerivation) (
+stdenv.mkDerivation (
   rec {
     inherit
       pname
@@ -97,6 +91,7 @@ in
       ]
       ++ lib.optionals (!server) [
         copyDesktopItems
+        libsForQt5.wrapQtAppsHook
       ];
 
     buildInputs =
@@ -119,11 +114,11 @@ in
           ]
         else
           [
-            qtbase
-            qtxmlpatterns
-            qtsensors
-            qtwebengine
-            qtwebchannel
+            libsForQt5.qtbase
+            libsForQt5.qtxmlpatterns
+            libsForQt5.qtsensors
+            libsForQt5.qtwebengine
+            libsForQt5.qtwebchannel
           ]
       );
 
@@ -139,7 +134,7 @@ in
         "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
       ]
       ++ lib.optionals (!server) [
-        "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
+        "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
       ];
 
     # Hack RStudio to only use the input R and provided libclang.

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
@@ -15491,7 +15491,7 @@ with pkgs;
     backend = "wayland";
   };
 
-  rstudio = libsForQt5.callPackage ../applications/editors/rstudio {
+  rstudio = callPackage ../applications/editors/rstudio {
     jdk = jdk8;
   };