diff --git a/pkgs/applications/editors/rstudio/default.nix b/pkgs/applications/editors/rstudio/default.nix
index 0a48250d3e8449..659793a4851237 100644
--- a/pkgs/applications/editors/rstudio/default.nix
+++ b/pkgs/applications/editors/rstudio/default.nix
@@ -31,20 +31,6 @@
 }:
 
 let
-  pname = "RStudio";
-  version = "2024.04.2+764";
-  RSTUDIO_VERSION_MAJOR = lib.versions.major version;
-  RSTUDIO_VERSION_MINOR = lib.versions.minor version;
-  RSTUDIO_VERSION_PATCH = lib.versions.patch version;
-  RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
-
-  src = fetchFromGitHub {
-    owner = "rstudio";
-    repo = "rstudio";
-    rev = "v" + version;
-    hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw=";
-  };
-
   mathJaxSrc = fetchurl {
     url = "https://s3.amazonaws.com/rstudio-buildtools/mathjax-27.zip";
     hash = "sha256-xWy6psTOA8H8uusrXqPDEtL7diajYCVHcMvLiPsgQXY=";
@@ -66,224 +52,220 @@ let
     hash = "sha256-lZnZvioztbBWWa6H177X6rRrrgACx2gMjVFDgNup93g=";
   };
 
-  description = "Set of integrated tools for the R language";
+  hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
+  # These dicts contain identically-named dict files, so we only keep the
+  # -large versions in case of clashes
+  largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
+  otherDicts = lib.filter (
+    d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
+  ) hunspellDictionaries;
+  dictionaries = largeDicts ++ otherDicts;
 in
-stdenv.mkDerivation (
-  rec {
-    inherit
-      pname
-      version
-      src
-      RSTUDIO_VERSION_MAJOR
-      RSTUDIO_VERSION_MINOR
-      RSTUDIO_VERSION_PATCH
-      RSTUDIO_VERSION_SUFFIX
-      ;
+stdenv.mkDerivation rec {
+  pname = "RStudio";
+  version = "2024.04.2+764";
 
-    nativeBuildInputs =
-      [
-        cmake
-        unzip
-        ant
-        jdk
-        pandoc
-        nodejs
-      ]
-      ++ lib.optionals (!server) [
-        copyDesktopItems
-        libsForQt5.wrapQtAppsHook
-      ];
+  RSTUDIO_VERSION_MAJOR = lib.versions.major version;
+  RSTUDIO_VERSION_MINOR = lib.versions.minor version;
+  RSTUDIO_VERSION_PATCH = lib.versions.patch version;
+  RSTUDIO_VERSION_SUFFIX = "+" + toString (lib.tail (lib.splitString "+" version));
 
-    buildInputs =
-      [
-        boost183
-        zlib
-        openssl
-        R
-        libuuid
-        yaml-cpp
-        soci
-        postgresql
-        quarto
-      ]
-      ++ (
-        if server then
-          [
-            sqlite.dev
-            pam
-          ]
-        else
-          [
-            libsForQt5.qtbase
-            libsForQt5.qtxmlpatterns
-            libsForQt5.qtsensors
-            libsForQt5.qtwebengine
-            libsForQt5.qtwebchannel
-          ]
-      );
+  src = fetchFromGitHub {
+    owner = "rstudio";
+    repo = "rstudio";
+    rev = "v" + version;
+    hash = "sha256-j258eW1MYQrB6kkpjyolXdNuwQ3zSWv9so4q0QLsZuw=";
+  };
 
-    cmakeFlags =
-      [
-        "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
-        "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
-        "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
-        "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
-        "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
-        "-DQUARTO_ENABLED=TRUE"
-        "-DPANDOC_VERSION=${pandoc.version}"
-        "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
-      ]
-      ++ lib.optionals (!server) [
-        "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
-      ];
+  nativeBuildInputs =
+    [
+      cmake
+      unzip
+      ant
+      jdk
+      pandoc
+      nodejs
+    ]
+    ++ lib.optionals (!server) [
+      copyDesktopItems
+      libsForQt5.wrapQtAppsHook
+    ];
 
-    # Hack RStudio to only use the input R and provided libclang.
-    patches = [
-      ./r-location.patch
-      ./clang-location.patch
-      ./use-system-node.patch
-      ./fix-resources-path.patch
-      ./pandoc-nix-path.patch
-      ./use-system-quarto.patch
-      ./ignore-etc-os-release.patch
+  buildInputs =
+    [
+      boost183
+      zlib
+      openssl
+      R
+      libuuid
+      yaml-cpp
+      soci
+      postgresql
+      quarto
+    ]
+    ++ lib.optionals server [
+      sqlite.dev
+      pam
+    ]
+    ++ lib.optionals (!server) [
+      libsForQt5.qtbase
+      libsForQt5.qtxmlpatterns
+      libsForQt5.qtsensors
+      libsForQt5.qtwebengine
+      libsForQt5.qtwebchannel
     ];
 
-    postPatch = ''
-      substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R}
+  cmakeFlags =
+    [
+      "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
+      "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
+      "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
+      "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
+      "-DRSTUDIO_DISABLE_CHECK_FOR_UPDATES=ON"
+      "-DQUARTO_ENABLED=TRUE"
+      "-DPANDOC_VERSION=${pandoc.version}"
+      "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
+    ]
+    ++ lib.optionals (!server) [
+      "-DQT_QMAKE_EXECUTABLE=${libsForQt5.qmake}/bin/qmake"
+    ];
+
+  # Hack RStudio to only use the input R and provided libclang.
+  patches = [
+    ./r-location.patch
+    ./clang-location.patch
+    ./use-system-node.patch
+    ./fix-resources-path.patch
+    ./pandoc-nix-path.patch
+    ./use-system-quarto.patch
+    ./ignore-etc-os-release.patch
+  ];
 
-      substituteInPlace src/gwt/build.xml \
-        --replace-fail '@node@' ${nodejs} \
-        --replace-fail './lib/quarto' ${quartoSrc}
+  postPatch = ''
+    substituteInPlace src/cpp/core/r_util/REnvironmentPosix.cpp --replace-fail '@R@' ${R}
 
-      substituteInPlace src/cpp/conf/rsession-dev.conf \
-        --replace-fail '@node@' ${nodejs}
+    substituteInPlace src/gwt/build.xml \
+      --replace-fail '@node@' ${nodejs} \
+      --replace-fail './lib/quarto' ${quartoSrc}
 
-      substituteInPlace src/cpp/core/libclang/LibClang.cpp \
-        --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \
-        --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so
+    substituteInPlace src/cpp/conf/rsession-dev.conf \
+      --replace-fail '@node@' ${nodejs}
 
-      substituteInPlace src/cpp/session/CMakeLists.txt \
-        --replace-fail '@pandoc@' ${pandoc} \
-        --replace-fail '@quarto@' ${quarto}
+    substituteInPlace src/cpp/core/libclang/LibClang.cpp \
+      --replace-fail '@libclang@' ${lib.getLib llvmPackages.libclang} \
+      --replace-fail '@libclang.so@' ${lib.getLib llvmPackages.libclang}/lib/libclang.so
 
-      substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
-        --replace-fail '@pandoc@' ${pandoc}/bin \
-        --replace-fail '@quarto@' ${quarto}
-    '';
+    substituteInPlace src/cpp/session/CMakeLists.txt \
+      --replace-fail '@pandoc@' ${pandoc} \
+      --replace-fail '@quarto@' ${quarto}
 
-    hunspellDictionaries = lib.filter lib.isDerivation (lib.unique (lib.attrValues hunspellDicts));
-    # These dicts contain identically-named dict files, so we only keep the
-    # -large versions in case of clashes
-    largeDicts = lib.filter (d: lib.hasInfix "-large-wordlist" d.name) hunspellDictionaries;
-    otherDicts = lib.filter (
-      d: !(lib.hasAttr "dictFileName" d && lib.elem d.dictFileName (map (d: d.dictFileName) largeDicts))
-    ) hunspellDictionaries;
-    dictionaries = largeDicts ++ otherDicts;
+    substituteInPlace src/cpp/session/include/session/SessionConstants.hpp \
+      --replace-fail '@pandoc@' ${pandoc}/bin \
+      --replace-fail '@quarto@' ${quarto}
+  '';
 
-    preConfigure = ''
-       mkdir dependencies/dictionaries
-       for dict in ${builtins.concatStringsSep " " dictionaries}; do
-         for i in "$dict/share/hunspell/"*; do
-           ln -s $i dependencies/dictionaries/
-         done
+  preConfigure = ''
+     mkdir dependencies/dictionaries
+     for dict in ${builtins.concatStringsSep " " dictionaries}; do
+       for i in "$dict/share/hunspell/"*; do
+         ln -s $i dependencies/dictionaries/
        done
+     done
 
-       unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
+     unzip -q ${mathJaxSrc} -d dependencies/mathjax-27
 
-      # As of Chocolate Cosmos, node 18.20.3 is used for runtime
-      # 18.18.2 is still used for build
-      # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
-      mkdir -p dependencies/common/node/18.20.3
+    # As of Chocolate Cosmos, node 18.20.3 is used for runtime
+    # 18.18.2 is still used for build
+    # see https://github.com/rstudio/rstudio/commit/facb5cf1ab38fe77813aaf36590804e4f865d780
+    mkdir -p dependencies/common/node/18.20.3
 
-       mkdir -p dependencies/pandoc/${pandoc.version}
-       cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
+     mkdir -p dependencies/pandoc/${pandoc.version}
+     cp ${pandoc}/bin/pandoc dependencies/pandoc/${pandoc.version}/pandoc
 
-       cp -r ${rsconnectSrc} dependencies/rsconnect
-       ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
-    '';
+     cp -r ${rsconnectSrc} dependencies/rsconnect
+     ( cd dependencies && ${R}/bin/R CMD build -d --no-build-vignettes rsconnect )
+  '';
 
-    postInstall = ''
-      mkdir -p $out/bin $out/share
+  postInstall = ''
+    mkdir -p $out/bin $out/share
 
-      ${lib.optionalString (!server) ''
-        mkdir -p $out/share/icons/hicolor/48x48/apps
-        ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
-      ''}
+    ${lib.optionalString (!server) ''
+      mkdir -p $out/share/icons/hicolor/48x48/apps
+      ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
+    ''}
 
-      for f in {${
-        if server then
-          "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
-        else
-          "diagnostics,rpostback,rstudio"
-      }}; do
-        ln -s $out/lib/rstudio/bin/$f $out/bin
-      done
+    for f in {${
+      if server then
+        "crash-handler-proxy,postback,r-ldpath,rpostback,rserver,rserver-pam,rsession,rstudio-server"
+      else
+        "diagnostics,rpostback,rstudio"
+    }}; do
+      ln -s $out/lib/rstudio/bin/$f $out/bin
+    done
 
-      for f in .gitignore .Rbuildignore LICENSE README; do
-        find . -name $f -delete
-      done
+    for f in .gitignore .Rbuildignore LICENSE README; do
+      find . -name $f -delete
+    done
 
-      rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
-    '';
+    rm -r $out/lib/rstudio/{INSTALL,COPYING,NOTICE,README.md,SOURCE,VERSION}
+  '';
 
-    meta = {
-      broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-      inherit description;
-      homepage = "https://www.rstudio.com/";
-      license = lib.licenses.agpl3Only;
-      maintainers = with lib.maintainers; [
-        ciil
-        cfhammill
-      ];
-      mainProgram = "rstudio" + lib.optionalString server "-server";
-      platforms = lib.platforms.linux;
-    };
+  qtWrapperArgs = lib.optionals (!server) [
+    "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
+  ];
 
-    passthru = {
-      inherit server;
-      tests = {
-        inherit (nixosTests) rstudio-server;
-      };
+  passthru = {
+    inherit server;
+    tests = {
+      inherit (nixosTests) rstudio-server;
     };
-  }
-  // lib.optionalAttrs (!server) {
-    qtWrapperArgs = [
-      "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
-    ];
+  };
 
-    desktopItems = [
-      (makeDesktopItem {
-        name = pname;
-        exec = "rstudio %F";
-        icon = "rstudio";
-        desktopName = "RStudio";
-        genericName = "IDE";
-        comment = description;
-        categories = [ "Development" ];
-        mimeTypes = [
-          "text/x-r-source"
-          "text/x-r"
-          "text/x-R"
-          "text/x-r-doc"
-          "text/x-r-sweave"
-          "text/x-r-markdown"
-          "text/x-r-html"
-          "text/x-r-presentation"
-          "application/x-r-data"
-          "application/x-r-project"
-          "text/x-r-history"
-          "text/x-r-profile"
-          "text/x-tex"
-          "text/x-markdown"
-          "text/html"
-          "text/css"
-          "text/javascript"
-          "text/x-chdr"
-          "text/x-csrc"
-          "text/x-c++hdr"
-          "text/x-c++src"
-        ];
-      })
+  meta = {
+    broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
+    description = "Set of integrated tools for the R language";
+    homepage = "https://www.rstudio.com/";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [
+      ciil
+      cfhammill
     ];
-  }
-)
+    mainProgram = "rstudio" + lib.optionalString server "-server";
+    platforms = lib.platforms.linux;
+  };
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "RStudio";
+      exec = "rstudio %F";
+      icon = "rstudio";
+      desktopName = "RStudio";
+      genericName = "IDE";
+      comment = meta.description;
+      categories = [ "Development" ];
+      mimeTypes = [
+        "text/x-r-source"
+        "text/x-r"
+        "text/x-R"
+        "text/x-r-doc"
+        "text/x-r-sweave"
+        "text/x-r-markdown"
+        "text/x-r-html"
+        "text/x-r-presentation"
+        "application/x-r-data"
+        "application/x-r-project"
+        "text/x-r-history"
+        "text/x-r-profile"
+        "text/x-tex"
+        "text/x-markdown"
+        "text/html"
+        "text/css"
+        "text/javascript"
+        "text/x-chdr"
+        "text/x-csrc"
+        "text/x-c++hdr"
+        "text/x-c++src"
+      ];
+    })
+  ];
+}