Commit 70004461 authored by K900's avatar K900
Browse files

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

parent 46da009c

pkgs/games/steam/fhsenv.nix

+4 −11
Original line number Diff line number Diff line
@@ -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"