From 12b7b2fac95b04c1afea2b164c68516a5c62a8b9 Mon Sep 17 00:00:00 2001
From: erop <egor.ponomarenko@gmail.com>
Date: Tue, 26 May 2026 17:24:27 +0200
Subject: [PATCH] nixos/steam: remove unnecessary bwrap wrapper

---
 nixos/modules/programs/steam.nix | 65 +++++++++++---------------------
 1 file changed, 23 insertions(+), 42 deletions(-)

diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 2ae30243c432..6b9cb8767dc3 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -56,38 +56,29 @@ in
       '';
       apply =
         steam:
-        steam.override (
-          prev:
-          {
-            extraEnv =
-              (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
-                STEAM_EXTRA_COMPAT_TOOLS_PATHS = extraCompatPaths;
-              })
-              // (lib.optionalAttrs cfg.extest.enable {
-                LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
-              })
-              // (prev.extraEnv or { });
-            extraLibraries =
-              pkgs:
-              let
-                prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
-                additionalLibs =
-                  with config.hardware.graphics;
-                  if pkgs.stdenv.hostPlatform.is64bit then
-                    [ package ] ++ extraPackages
-                  else
-                    [ package32 ] ++ extraPackages32;
-              in
-              prevLibs ++ additionalLibs;
-            extraPkgs = p: (cfg.extraPackages ++ lib.optionals (prev ? extraPkgs) (prev.extraPkgs p));
-          }
-          // lib.optionalAttrs (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
-            buildFHSEnv = pkgs.buildFHSEnv.override {
-              # use the setuid wrapped bubblewrap
-              bubblewrap = "${config.security.wrapperDir}/..";
-            };
-          }
-        );
+        steam.override (prev: {
+          extraEnv =
+            (lib.optionalAttrs (cfg.extraCompatPackages != [ ]) {
+              STEAM_EXTRA_COMPAT_TOOLS_PATHS = extraCompatPaths;
+            })
+            // (lib.optionalAttrs cfg.extest.enable {
+              LD_PRELOAD = "${pkgs.pkgsi686Linux.extest}/lib/libextest.so";
+            })
+            // (prev.extraEnv or { });
+          extraLibraries =
+            pkgs:
+            let
+              prevLibs = if prev ? extraLibraries then prev.extraLibraries pkgs else [ ];
+              additionalLibs =
+                with config.hardware.graphics;
+                if pkgs.stdenv.hostPlatform.is64bit then
+                  [ package ] ++ extraPackages
+                else
+                  [ package32 ] ++ extraPackages32;
+            in
+            prevLibs ++ additionalLibs;
+          extraPkgs = p: (cfg.extraPackages ++ lib.optionals (prev ? extraPkgs) (prev.extraPkgs p));
+        });
       description = ''
         The Steam package to use. Additional libraries are added from the system
         configuration to ensure graphics work properly.
@@ -218,16 +209,6 @@ in
       enable32Bit = true;
     };
 
-    security.wrappers = lib.mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
-      # needed or steam fails
-      bwrap = {
-        owner = "root";
-        group = "root";
-        source = "${pkgs.bubblewrap}/bin/bwrap";
-        setuid = true;
-      };
-    };
-
     programs.steam.extraPackages = cfg.fontPackages;
 
     programs.gamescope.enable = lib.mkDefault cfg.gamescopeSession.enable;