steam: decimate

NixOS · Sep 12, 2024 · 353db8b · 353db8b
1 parent 0c75b59
commit 353db8b
Show file tree

Hide file tree

Showing 8 changed files with 115 additions and 427 deletions.
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
@@ -31,7 +31,7 @@ in {
       default = pkgs.steam;
       defaultText = lib.literalExpression "pkgs.steam";
       example = lib.literalExpression ''
-        pkgs.steam-small.override {
+        pkgs.steam.override {
           extraEnv = {
             MANGOHUD = true;
             OBS_VKCAPTURE = true;

diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix b/pkgs/build-support/build-fhsenv-bubblewrap/buildFHSEnv.nix
@@ -12,6 +12,7 @@
 , targetPkgs ? pkgs: []
 , multiPkgs ? pkgs: []
 , multiArch ? false # Whether to include 32bit packages
+, includeClosures ? false # Whether to include closures of all packages
 , extraBuildCommands ? ""
 , extraBuildCommandsMulti ? ""
 , extraOutputsToInstall ? []
@@ -171,13 +172,15 @@ let
           ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas
       fi
     '';
+    inherit includeClosures;
   };
 
   staticUsrProfileMulti = buildEnv {
     name = "${name}-usr-multi";
     paths = baseMultiPaths ++ multiPaths;
     extraOutputsToInstall = [ "out" "lib" ] ++ extraOutputsToInstall;
     ignoreCollisions = true;
+    inherit includeClosures;
   };
 
   # setup library paths only for the targeted architecture

diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix
@@ -1,5 +1,5 @@
 { makeScopeWithSplicing', generateSplicesForMkScope
-, stdenv, buildFHSEnv, pkgsi686Linux, mesa-demos
+, stdenv
 }:
 
 let
@@ -10,21 +10,8 @@ let
                 else if stdenv.hostPlatform.system == "i686-linux" then "i386"
                 else throw "Unsupported platform: ${stdenv.hostPlatform.system}";
 
-    steam-runtime = callPackage ./runtime.nix { };
-    steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
     steam = callPackage ./steam.nix { };
-    steam-fhsenv = callPackage ./fhsenv.nix {
-      mesa-demos-i686 =
-        if self.steamArch == "amd64"
-        then pkgsi686Linux.mesa-demos
-        else mesa-demos;
-      steam-runtime-wrapped-i686 =
-        if self.steamArch == "amd64"
-        then pkgsi686Linux.steamPackages.steam-runtime-wrapped
-        else null;
-      inherit buildFHSEnv;
-    };
-    steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; };
+    steam-fhsenv = callPackage ./fhsenv.nix {};
 
     # This has to exist so Hydra tries to build all of Steam's dependencies.
     # FIXME: Maybe we should expose it as something more generic?