mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-02-01 01:33:20 +00:00
Merge pull request #10093 from yochai/master
steam: added libcxxabi workaround
This commit is contained in:
commit
8d1dd2630a
@ -15,6 +15,7 @@ buildFHSUserEnv {
|
|||||||
pkgs.xdg_utils
|
pkgs.xdg_utils
|
||||||
pkgs.xorg.xrandr
|
pkgs.xorg.xrandr
|
||||||
pkgs.which
|
pkgs.which
|
||||||
|
pkgs.libcxxabi
|
||||||
]
|
]
|
||||||
++ lib.optional (config.steam.java or false) pkgs.jdk
|
++ lib.optional (config.steam.java or false) pkgs.jdk
|
||||||
++ lib.optional (config.steam.primus or false) pkgs.primus
|
++ lib.optional (config.steam.primus or false) pkgs.primus
|
||||||
@ -46,6 +47,8 @@ buildFHSUserEnv {
|
|||||||
pkgs.xorg.libXtst
|
pkgs.xorg.libXtst
|
||||||
pkgs.xorg.libXxf86vm
|
pkgs.xorg.libXxf86vm
|
||||||
|
|
||||||
|
pkgs.libcxxabi
|
||||||
|
|
||||||
pkgs.ffmpeg
|
pkgs.ffmpeg
|
||||||
pkgs.libpng12
|
pkgs.libpng12
|
||||||
pkgs.mesa
|
pkgs.mesa
|
||||||
@ -74,6 +77,8 @@ buildFHSUserEnv {
|
|||||||
export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so:$LD_PRELOAD
|
export LD_PRELOAD=/lib32/libpulse.so:/lib64/libpulse.so:/lib32/libasound.so:/lib64/libasound.so:$LD_PRELOAD
|
||||||
# Another one for https://github.com/ValveSoftware/steam-for-linux/issues/3801
|
# Another one for https://github.com/ValveSoftware/steam-for-linux/issues/3801
|
||||||
export LD_PRELOAD=/lib32/libstdc++.so:/lib64/libstdc++.so:$LD_PRELOAD
|
export LD_PRELOAD=/lib32/libstdc++.so:/lib64/libstdc++.so:$LD_PRELOAD
|
||||||
|
# An ugly fix to get Sid Meier's Civilization V to launch.
|
||||||
|
export LD_PRELOAD=/lib32/libc++abi.so:/lib64/libc++abi.so:$LD_PRELOAD
|
||||||
'';
|
'';
|
||||||
|
|
||||||
runScript = "steam";
|
runScript = "steam";
|
||||||
|
Loading…
Reference in New Issue
Block a user