diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-08-26 14:18:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-26 14:18:37 +0200 |
| commit | 9eb55825d602f3d196a0dc79cd44c4bc160c2ef8 (patch) | |
| tree | 0f48e62730f68aec958543f20cc1e7527e0562cc | |
| parent | metacity, gnome-notes: Fixups for #333917 (#337452) (diff) | |
| parent | steam: use 32bit compatible ldd (diff) | |
| download | nixpkgs-9eb55825d602f3d196a0dc79cd44c4bc160c2ef8.tar.gz | |
steam: fix 32bit driver check, use 32bit compatible ldd, make pressure-vessel better (#330468)
| -rw-r--r-- | .git-blame-ignore-revs | 3 | ||||
| -rw-r--r-- | pkgs/games/steam/fhsenv.nix | 12 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 04f9ae0c7302..480cba954acd 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -154,6 +154,9 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856 # nixos/ollama: format with nixfmt-rfc-style (#329561) 246d1ee533810ac1946d863bbd9de9b525818d56 +# steam: cleanup (#216972) +ad815aebfbfe1415ff6436521d545029c803c3fb + # nixos/nvidia: apply nixfmt-rfc-style (#313440) fbdcdde04a7caa007e825a8b822c75fab9adb2d6 diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 8b504b6c55b6..f59a38649671 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -23,7 +23,7 @@ let # Errors in output without those pciutils # run.sh wants ldconfig - glibc.bin + glibc_multi.bin # Games' dependencies xorg.xrandr which @@ -206,7 +206,6 @@ in buildFHSEnv rec { gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-base json-glib # paradox launcher (Stellaris) - libdrm libxkbcommon # paradox launcher libvorbis # Dead Cells libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 @@ -223,9 +222,7 @@ in buildFHSEnv rec { zlib atk cairo - freetype gdk-pixbuf - fontconfig # Prison Architect libGLU @@ -271,10 +268,10 @@ in buildFHSEnv rec { '' + extraProfile; 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 [ -f /etc/NIXOS ]; then # Check only useful on NixOS + ${glxinfo-i686}/bin/glxinfo 2>&1 | grep -q Error # If there was an error running glxinfo, we know something is wrong with the configuration - if [ $? -ne 0 ]; then + if [ $? -eq 0 ]; then cat <<EOF > /dev/stderr ** WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix @@ -303,6 +300,7 @@ in buildFHSEnv rec { '' + args.extraPreBwrapCmds or ""; extraBwrapArgs = [ + "--bind /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript "--bind-try /tmp/dumps /tmp/dumps" ] ++ args.extraBwrapArgs or []; |