Merge pull request #216972 from SuperSandro2000/steam-fhs-full

steam-small: init

pkgs/games/steam/default.nix

···
 let
   steamPackagesFun = self: let
     inherit (self) callPackage;
-  in {
+  in rec {
     steamArch = if stdenv.hostPlatform.system == "x86_64-linux" then "amd64"
                 else if stdenv.hostPlatform.system == "i686-linux" then "i386"
                 else throw "Unsupported platform: ${stdenv.hostPlatform.system}";
···
         else null;
       inherit buildFHSUserEnv;
     };
+    steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; };
     steamcmd = callPackage ./steamcmd.nix { };
   };
   keep = self: { };

pkgs/games/steam/fhsenv.nix

···
-{ config, lib, writeScript, buildFHSUserEnv, steam, glxinfo-i686
+{ lib, stdenv, writeScript, buildFHSUserEnv, steam, glxinfo-i686, runtimeShell
 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null
 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs
 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs
 , extraProfile ? "" # string to append to profile
 , extraArgs ? "" # arguments to always pass to steam
-, runtimeOnly ? false
-, runtimeShell
-, stdenv
-
-# DEPRECATED
-, withJava ? config.steam.java or false
-, withPrimus ? config.steam.primus or false
+, withGameSpecificLibraries ? true # exclude game specific libraries
 }:
 
 let
-  commonTargetPkgs = pkgs: with pkgs;
-    [
-      # Needed for operating system detection until
-      # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved
-      lsb-release
-      # Errors in output without those
-      pciutils
-      # Games' dependencies
-      xorg.xrandr
-      which
-      # Needed by gdialog, including in the steam-runtime
-      perl
-      # Open URLs
-      xdg-utils
-      iana-etc
-      # Steam Play / Proton
-      python3
-      # Steam VR
-      procps
-      usbutils
+  commonTargetPkgs = pkgs: with pkgs; [
+    # Needed for operating system detection until
+    # https://github.com/ValveSoftware/steam-for-linux/issues/5909 is resolved
+    lsb-release
+    # Errors in output without those
+    pciutils
+    # Games' dependencies
+    xorg.xrandr
+    which
+    # Needed by gdialog, including in the steam-runtime
+    perl
+    # Open URLs
+    xdg-utils
+    iana-etc
+    # Steam Play / Proton
+    python3
+    # Steam VR
+    procps
+    usbutils
 
-      # electron based launchers need newer versions of these libraries than what runtime provides
-      mesa
-      sqlite
-    ] ++ lib.optional withJava jdk8 # TODO: upgrade https://github.com/NixOS/nixpkgs/pull/89731
-      ++ lib.optional withPrimus primus
-      ++ extraPkgs pkgs;
+    # electron based launchers need newer versions of these libraries than what runtime provides
+    mesa
+    sqlite
+  ] ++ extraPkgs pkgs;
 
   ldPath = lib.optionals stdenv.is64bit [ "/lib64" ]
   ++ [ "/lib32" ]
···
     libthai
     pango
 
-    # Not formally in runtime but needed by some games
-    at-spi2-atk
-    at-spi2-core   # CrossCode
-    gst_all_1.gstreamer
-    gst_all_1.gst-plugins-ugly
-    gst_all_1.gst-plugins-base
-    json-glib # paradox launcher (Stellaris)
-    libdrm
-    libxkbcommon # paradox launcher
-    libvorbis # Dead Cells
-    libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
-    mono
-    xorg.xkeyboardconfig
-    xorg.libpciaccess
-    xorg.libXScrnSaver # Dead Cells
-    udev # shadow of the tomb raider
-    icu # dotnet runtime, e.g. stardew valley
-
-    # screeps dependencies
-    gtk3
-    dbus
-    zlib
-    atk
-    cairo
-    freetype
-    gdk-pixbuf
-    fontconfig
-
-    # friends options won't display "Launch Game" without it
-    lsof
-
-    # called by steam's setup.sh
-    file
-
-    # Prison Architect
-    libGLU
-    libuuid
-    libbsd
-    alsa-lib
-
-    # Loop Hero
-    libidn2
-    libpsl
-    nghttp2.lib
-    openssl_1_1
-    rtmpdump
+    lsof # friends options won't display "Launch Game" without it
+    file # called by steam's setup.sh
 
     # dependencies for mesa drivers, needed inside pressure-vessel
     mesa.llvmPackages.llvm.lib
···
     xorg.libxshmfence
     xorg.libXxf86vm
     libelf
-
-    # pressure-vessel (required for mangohud and possibly more)
-    elfutils.out
-
-    # Required
-    glib
-    gtk2
-    bzip2
+    (lib.getLib elfutils)
 
     # Without these it silently fails
     xorg.libXinerama
···
     libusb1
     dbus-glib
     ffmpeg
-    # Only libraries are needed from those two
     libudev0-shim
 
     # Verified games requirements
+    fontconfig
+    freetype
     xorg.libXt
     xorg.libXmu
     libogg
···
     SDL
     SDL2_image
     glew110
+    libdrm
     libidn
     tbb
+    zlib
 
     # Other things from runtime
+    glib
+    gtk2
+    bzip2
     flac
     freeglut
     libjpeg
···
     librsvg
     xorg.libXft
     libvdpau
-  ]
-  ++ steamPackages.steam-runtime-wrapped.overridePkgs
+  ] ++ lib.optionals withGameSpecificLibraries [
+    # Not formally in runtime but needed by some games
+    at-spi2-atk
+    at-spi2-core   # CrossCode
+    gst_all_1.gstreamer
+    gst_all_1.gst-plugins-ugly
+    gst_all_1.gst-plugins-base
+    json-glib # paradox launcher (Stellaris)
+    libdrm
+    libxkbcommon # paradox launcher
+    libvorbis # Dead Cells
+    libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
+    mono
+    xorg.xkeyboardconfig
+    xorg.libpciaccess
+    xorg.libXScrnSaver # Dead Cells
+    udev # Shadow of the Tomb Raider
+    icu # dotnet runtime, e.g. Stardew Valley
+
+    # screeps dependencies
+    gtk3
+    dbus
+    zlib
+    atk
+    cairo
+    freetype
+    gdk-pixbuf
+    fontconfig
+
+    # Prison Architect
+    libGLU
+    libuuid
+    libbsd
+    alsa-lib
+
+    # Loop Hero
+    libidn2
+    libpsl
+    nghttp2.lib
+    openssl_1_1
+    rtmpdump
+  ] ++ steamPackages.steam-runtime-wrapped.overridePkgs
   ++ extraLibraries pkgs;
 
   extraInstallCommands = ''
···
     exec steam ${extraArgs} "$@"
   '';
 
-  inherit (steam) meta;
+  meta = steam.meta // lib.optionalAttrs (!withGameSpecificLibraries) {
+    description = steam.meta.description + " (without game specific libraries)";
+  };
 
   # allows for some gui applications to share IPC
   # this fixes certain issues where they don't render correctly
···
 
     targetPkgs = commonTargetPkgs;
     inherit multiPkgs profile extraInstallCommands;
-
     inherit unshareIpc unsharePid;
 
     runScript = writeScript "steam-run" ''

pkgs/top-level/all-packages.nix

···
   });
 
   steam = steamPackages.steam-fhsenv;
+  steam-small = steamPackages.steam-fhsenv-small;
 
   steam-run = steam.run;