nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Sandro 2024-08-26 14:18:37 +02:00 committed by GitHub
commit 9eb55825d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.git-blame-ignore-revs
View File

@ -154,6 +154,9 @@ bdfde18037f8d9f9b641a4016c8ada4dc4cbf856
# nixos/ollama: format with nixfmt-rfc-style (#329561) # nixos/ollama: format with nixfmt-rfc-style (#329561)
246d1ee533810ac1946d863bbd9de9b525818d56 246d1ee533810ac1946d863bbd9de9b525818d56
# steam: cleanup (#216972)
ad815aebfbfe1415ff6436521d545029c803c3fb
# nixos/nvidia: apply nixfmt-rfc-style (#313440) # nixos/nvidia: apply nixfmt-rfc-style (#313440)
fbdcdde04a7caa007e825a8b822c75fab9adb2d6 fbdcdde04a7caa007e825a8b822c75fab9adb2d6

12
pkgs/games/steam/fhsenv.nix
View File

@ -23,7 +23,7 @@ let
# Errors in output without those # Errors in output without those
pciutils pciutils
# run.sh wants ldconfig # run.sh wants ldconfig
glibc.bin glibc_multi.bin
# Games' dependencies # Games' dependencies
xorg.xrandr xorg.xrandr
which which
@ -206,7 +206,6 @@ in buildFHSEnv rec {
gst_all_1.gst-plugins-ugly gst_all_1.gst-plugins-ugly
gst_all_1.gst-plugins-base gst_all_1.gst-plugins-base
json-glib # paradox launcher (Stellaris) json-glib # paradox launcher (Stellaris)
libdrm
libxkbcommon # paradox launcher libxkbcommon # paradox launcher
libvorbis # Dead Cells libvorbis # Dead Cells
libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2 libxcrypt # Alien Isolation, XCOM 2, Company of Heroes 2
@ -223,9 +222,7 @@ in buildFHSEnv rec {
zlib zlib
atk atk
cairo cairo
freetype
gdk-pixbuf gdk-pixbuf
fontconfig
# Prison Architect # Prison Architect
libGLU libGLU
@ -271,10 +268,10 @@ in buildFHSEnv rec {
'' + extraProfile; '' + extraProfile;
runScript = writeShellScript "steam-wrapper.sh" '' runScript = writeShellScript "steam-wrapper.sh" ''
if [ -f /host/etc/NIXOS ]; then # Check only useful on NixOS if [ -f /etc/NIXOS ]; then # Check only useful on NixOS
${glxinfo-i686}/bin/glxinfo >/dev/null 2>&1 ${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 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 cat <<EOF > /dev/stderr
** **
WARNING: Steam is not set up. Add the following options to /etc/nixos/configuration.nix 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 ""; '' + args.extraPreBwrapCmds or "";
extraBwrapArgs = [ extraBwrapArgs = [
"--bind /etc/NIXOS /etc/NIXOS" # required 32bit driver check in runScript
"--bind-try /tmp/dumps /tmp/dumps" "--bind-try /tmp/dumps /tmp/dumps"
] ++ args.extraBwrapArgs or []; ] ++ args.extraBwrapArgs or [];