Unverified Commit 9eb55825 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

steam: fix 32bit driver check, use 32bit compatible ldd, make pressure-vessel better (#330468)

parents 28d45487 dc8cfc56

.git-blame-ignore-revs

+3 −0
Original line number Diff line number Diff line
@@ -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

pkgs/games/steam/fhsenv.nix

+5 −7
Original line number Diff line number Diff line
@@ -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 [];