BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #33213 from wchresta/master

Browse source 
steam: add wrapper testing for libGL
This commit is contained in:
Yegor Timoshenko 2018-01-02 21:03:28 +03:00 committed by GitHub
commit 63c1a54257
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
pkgs/games/steam/chrootenv.nix
View file

@ -69,6 +69,9 @@ in buildFHSUserEnv rec {
xlibs.libX11
xlibs.libXfixes
# Needed to properly check for libGL.so.1 in steam-wrapper.sh
pkgsi686Linux.glxinfo
# Not formally in runtime but needed by some games
gst_all_1.gstreamer
gst_all_1.gst-plugins-ugly
@ -103,7 +106,26 @@ in buildFHSUserEnv rec {
export TZDIR=/etc/zoneinfo
'';
runScript = "steam";
runScript = writeScript "steam-wrapper.sh" ''
#!${stdenv.shell}
if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS
glxinfo >/dev/null 2>&1
# If there was an error running glxinfo, we know something is wrong with the configuration
if [ $? -ne 0 ]; then
cat <<EOF > /dev/stderr
**
WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix
and then run \`sudo nixos-rebuild switch\`:
{
hardware.opengl.driSupport32Bit = true;
hardware.pulseaudio.support32Bit = true;
}
**
EOF
fi
fi
steam
'';
passthru.run = buildFHSUserEnv {
name = "steam-run";