Merge pull request #262393 from K900/steam-cleanups

steam: allow setting extraBwrapArgs, remove unshare* options matching defaults

authored by K900 and committed by GitHub c2f9b2e6 c781bd7a

+4 -11
+4 -11
pkgs/games/steam/fhsenv.nix
··· 3 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs 4 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs 5 , extraProfile ? "" # string to append to profile 6 , extraArgs ? "" # arguments to always pass to steam 7 , extraEnv ? { } # Environment variables to pass to Steam 8 , withGameSpecificLibraries ? true # include game specific libraries ··· 277 exec steam ${extraArgs} "$@" 278 ''; 279 280 meta = 281 if steam != null 282 then ··· 287 description = "Steam dependencies (dummy package, do not use)"; 288 }; 289 290 - # allows for some gui applications to share IPC 291 - # this fixes certain issues where they don't render correctly 292 - unshareIpc = false; 293 - 294 - # Some applications such as Natron need access to MIT-SHM or other 295 - # shared memory mechanisms. Unsharing the pid namespace 296 - # breaks the ability for application to reference shared memory. 297 - unsharePid = false; 298 - 299 passthru.run = buildFHSEnv { 300 name = "steam-run"; 301 302 targetPkgs = commonTargetPkgs; 303 - inherit multiArch multiPkgs profile extraInstallCommands; 304 - inherit unshareIpc unsharePid; 305 306 runScript = writeShellScript "steam-run" '' 307 run="$1"
··· 3 , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs 4 , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs 5 , extraProfile ? "" # string to append to profile 6 + , extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap 7 , extraArgs ? "" # arguments to always pass to steam 8 , extraEnv ? { } # Environment variables to pass to Steam 9 , withGameSpecificLibraries ? true # include game specific libraries ··· 278 exec steam ${extraArgs} "$@" 279 ''; 280 281 + inherit extraBwrapArgs; 282 + 283 meta = 284 if steam != null 285 then ··· 290 description = "Steam dependencies (dummy package, do not use)"; 291 }; 292 293 passthru.run = buildFHSEnv { 294 name = "steam-run"; 295 296 targetPkgs = commonTargetPkgs; 297 + inherit multiArch multiPkgs profile extraInstallCommands extraBwrapArgs; 298 299 runScript = writeShellScript "steam-run" '' 300 run="$1"