diff options
Diffstat (limited to 'pkgs/games/steam/fhsenv.nix')
-rw-r--r-- | pkgs/games/steam/fhsenv.nix | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index c50176dce790e..8d461104eaacd 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -1,9 +1,10 @@ -{ lib, stdenv, writeScript, buildFHSUserEnv, steam, glxinfo-i686, runtimeShell +{ lib, stdenv, writeShellScript, buildFHSUserEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs , extraProfile ? "" # string to append to profile , extraArgs ? "" # arguments to always pass to steam +, extraEnv ? { } # Environment variables to pass to Steam , withGameSpecificLibraries ? true # exclude game specific libraries }: @@ -52,6 +53,8 @@ let fi ''; + envScript = lib.toShellVars extraEnv; + in buildFHSUserEnv rec { name = "steam"; @@ -228,8 +231,7 @@ in buildFHSUserEnv rec { export SDL_JOYSTICK_DISABLE_UDEV=1 '' + extraProfile; - runScript = writeScript "steam-wrapper.sh" '' - #!${runtimeShell} + runScript = writeShellScript "steam-wrapper.sh" '' if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS ${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 # If there was an error running glxinfo, we know something is wrong with the configuration @@ -249,6 +251,9 @@ in buildFHSUserEnv rec { ${exportLDPath} ${fixBootstrap} + + set -o allexport # Export the following env vars + ${envScript} exec steam ${extraArgs} "$@" ''; @@ -272,8 +277,7 @@ in buildFHSUserEnv rec { inherit multiPkgs profile extraInstallCommands; inherit unshareIpc unsharePid; - runScript = writeScript "steam-run" '' - #!${runtimeShell} + runScript = writeShellScript "steam-run" '' run="$1" if [ "$run" = "" ]; then echo "Usage: steam-run command-to-run args..." >&2 @@ -283,6 +287,9 @@ in buildFHSUserEnv rec { ${exportLDPath} ${fixBootstrap} + + set -o allexport # Export the following env vars + ${envScript} exec -- "$run" "$@" ''; |