rstudio-server, rstudioServerWrapper: init at rstudio.version (1.4.1717)

Co-authored-by: Justin Bedo <cu@cua0.org>
Co-authored-by: Jonathan Ringer <jonringer@users.noreply.github.com>
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: Benjamin Darwin <bcdarwin@gmail.com>

pkgs/applications/editors/rstudio/default.nix

@@ -1,4 +1,5 @@
 { lib
+, stdenv
 , mkDerivation
 , fetchurl
 , fetchpatch
@@ -30,6 +31,9 @@
 , nodejs
 , mkYarnModules
 , qmake
+, server ? false # build server version
+, sqlite
+, pam
 }:
 
 let
@@ -65,8 +69,10 @@ let
     yarnNix = ./yarndeps.nix;
   };
 
+  description = "Set of integrated tools for the R language";
 in
-mkDerivation rec {
+(if server then stdenv.mkDerivation else mkDerivation)
+  (rec {
     inherit pname version src RSTUDIO_VERSION_MAJOR RSTUDIO_VERSION_MINOR RSTUDIO_VERSION_PATCH;
 
     nativeBuildInputs = [
@@ -77,6 +83,7 @@ mkDerivation rec {
       makeWrapper
       pandoc
       nodejs
+    ] ++ lib.optional (!server) [
       copyDesktopItems
     ];
 
@@ -85,26 +92,31 @@ mkDerivation rec {
       zlib
       openssl
       R
+      libuuid
+      libyamlcpp
+      soci
+      postgresql
+    ] ++ (if server then [
+      sqlite.dev
+      pam
+    ] else [
       qtbase
       qtxmlpatterns
       qtsensors
       qtwebengine
       qtwebchannel
-    libuuid
+    ]);
-    libyamlcpp
-    soci
-    postgresql
-  ];
 
     cmakeFlags = [
-    "-DRSTUDIO_TARGET=Desktop"
+      "-DRSTUDIO_TARGET=${if server then "Server" else "Desktop"}"
       "-DCMAKE_BUILD_TYPE=Release"
-    "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
       "-DRSTUDIO_USE_SYSTEM_SOCI=ON"
       "-DRSTUDIO_USE_SYSTEM_BOOST=ON"
       "-DRSTUDIO_USE_SYSTEM_YAML_CPP=ON"
       "-DPANDOC_VERSION=${pandoc.version}"
       "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib/rstudio"
+    ] ++ lib.optional (!server) [
+      "-DQT_QMAKE_EXECUTABLE=${qmake}/bin/qmake"
     ];
 
     # Hack RStudio to only use the input R and provided libclang.
@@ -168,10 +180,16 @@ mkDerivation rec {
     '';
 
     postInstall = ''
-    mkdir -p $out/share/icons/hicolor/48x48/apps $out/bin
+      mkdir -p $out/bin $out/share
-    ln $out/lib/rstudio/rstudio.png $out/share/icons/hicolor/48x48/apps
 
-    for f in {diagnostics,rpostback,rstudio}; do
+      ${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
 
@@ -182,28 +200,30 @@ mkDerivation rec {
       rm -r $out/lib/rstudio/bin/{pandoc/pandoc,pandoc}
     '';
 
+    meta = with lib; {
+      inherit description;
+      homepage = "https://www.rstudio.com/";
+      license = licenses.agpl3Only;
+      maintainers = with maintainers; [ ciil cfhammill ];
+      platforms = platforms.linux;
+    };
+
+    passthru = { inherit server; };
+  } // lib.optionalAttrs (!server) {
     qtWrapperArgs = [
       "--suffix PATH : ${lib.makeBinPath [ gnumake ]}"
     ];
 
     desktopItems = [
       (makeDesktopItem {
-      name = "${pname}";
+        name = pname;
         exec = "rstudio %F";
         icon = "rstudio";
         desktopName = "RStudio";
         genericName = "IDE";
-      comment = meta.description;
+        comment = description;
         categories = "Development;";
         mimeType = "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 = with lib; {
-    description = "Set of integrated tools for the R language";
-    homepage = "https://www.rstudio.com/";
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ ciil ];
-    platforms = platforms.linux;
-  };
-}

pkgs/development/r-modules/wrapper-rstudio.nix

@@ -1,13 +1,20 @@
-{ lib, runCommand, R, rstudio, wrapQtAppsHook, recommendedPackages, packages, qtbase }:
+{ lib
+, runCommand
+, R
+, rstudio
+, makeWrapper
+, wrapQtAppsHook
+, recommendedPackages
+, packages
+, fontconfig
+}:
 
-let
+runCommand (rstudio.name + "-wrapper")
-  qtVersion = with lib.versions; "${major qtbase.version}.${minor qtbase.version}";
+{
-in
-runCommand (rstudio.name + "-wrapper") {
   preferLocalBuild = true;
   allowSubstitutes = false;
 
-  nativeBuildInputs = [wrapQtAppsHook];
+  nativeBuildInputs = [ (if rstudio.server then makeWrapper else wrapQtAppsHook) ];
   dontWrapQtApps = true;
 
   buildInputs = [ R rstudio ] ++ recommendedPackages ++ packages;
@@ -22,14 +29,27 @@ runCommand (rstudio.name + "-wrapper") {
   # uses R_PROFILE_USER to load this code at startup in RStudio.
   fixLibsR = "fix_libs.R";
 }
+  (
     ''
-mkdir $out
+      mkdir -p $out/bin
       ln -s ${rstudio}/share $out
       echo "# Autogenerated by wrapper-rstudio.nix from R_LIBS_SITE" > $out/$fixLibsR
       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
+    '' +
+    (if
+      rstudio.server then ''
+      makeWrapper ${rstudio}/bin/rsession $out/bin/rsession \
+        --set R_PROFILE_USER $out/$fixLibsR --set FONTCONFIG_FILE ${fontconfig.out}/etc/fonts/fonts.conf
+
+      makeWrapper ${rstudio}/bin/rserver $out/bin/rserver \
+        --add-flags --rsession-path=$out/bin/rsession
+    ''
+    else
+      ''
         makeQtWrapper ${rstudio}/bin/rstudio $out/bin/rstudio \
           --set R_PROFILE_USER $out/$fixLibsR
-''
+      '')
+  )

pkgs/top-level/all-packages.nix

@@ -20754,6 +20754,8 @@ with pkgs;
     packages = [];
   };
 
+  rstudioServerWrapper = rstudioWrapper.override { rstudio = rstudio-server; };
+
   rPackages = dontRecurseIntoAttrs (callPackage ../development/r-modules {
     overrides = (config.rPackageOverrides or (_: {})) pkgs;
   });
@@ -28382,6 +28384,8 @@ with pkgs;
     jdk = jdk8;
   };
 
+  rstudio-server = rstudio.override { server = true; };
+
   rsync = callPackage ../applications/networking/sync/rsync (config.rsync or {});
   rrsync = callPackage ../applications/networking/sync/rsync/rrsync.nix {};