diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-21 12:01:08 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-10-21 12:01:08 +0000 |
commit | 0c34dab04fdaac76bdd9dc21d35e9f2ebe22ea75 (patch) | |
tree | f1e9319259310c99f755f9360da2b73759621086 /pkgs/games | |
parent | 1c4183d88a7857526ee4a62e45aa0c203d56b1de (diff) | |
parent | 9ef114e19ac93be290dcca9b576d3f8a91c99d70 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/games')
-rw-r--r-- | pkgs/games/steam/fhsenv.nix | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index a6734b640638e..78c669614c07d 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -3,6 +3,7 @@ , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile +, extraBwrapArgs ? [ ] # extra arguments to pass to bubblewrap , extraArgs ? "" # arguments to always pass to steam , extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # include game specific libraries @@ -277,6 +278,8 @@ in buildFHSEnv rec { exec steam ${extraArgs} "$@" ''; + inherit extraBwrapArgs; + meta = if steam != null then @@ -287,21 +290,11 @@ in buildFHSEnv rec { description = "Steam dependencies (dummy package, do not use)"; }; - # allows for some gui applications to share IPC - # this fixes certain issues where they don't render correctly - unshareIpc = false; - - # Some applications such as Natron need access to MIT-SHM or other - # shared memory mechanisms. Unsharing the pid namespace - # breaks the ability for application to reference shared memory. - unsharePid = false; - passthru.run = buildFHSEnv { name = "steam-run"; targetPkgs = commonTargetPkgs; - inherit multiArch multiPkgs profile extraInstallCommands; - inherit unshareIpc unsharePid; + inherit multiArch multiPkgs profile extraInstallCommands extraBwrapArgs; runScript = writeShellScript "steam-run" '' run="$1" |