-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathno32bitsteam.patch
More file actions
83 lines (73 loc) · 3.63 KB
/
no32bitsteam.patch
File metadata and controls
83 lines (73 loc) · 3.63 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index 5a791d0cea0f..750efffa0810 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -215,7 +215,7 @@ in
hardware.graphics = {
# this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
enable = true;
- enable32Bit = true;
+ #enable32Bit = true;
};
security.wrappers = lib.mkIf (cfg.gamescopeSession.enable && gamescopeCfg.capSysNice) {
@@ -236,8 +236,8 @@ in
];
# enable 32bit pulseaudio/pipewire support if needed
- services.pulseaudio.support32Bit = config.services.pulseaudio.enable;
- services.pipewire.alsa.support32Bit = config.services.pipewire.alsa.enable;
+ #services.pulseaudio.support32Bit = config.services.pulseaudio.enable;
+ #services.pipewire.alsa.support32Bit = config.services.pipewire.alsa.enable;
hardware.steam-hardware.enable = true;
diff --git a/pkgs/by-name/st/steam/package.nix b/pkgs/by-name/st/steam/package.nix
index fe3bc2dddf86..f44532c666f6 100644
--- a/pkgs/by-name/st/steam/package.nix
+++ b/pkgs/by-name/st/steam/package.nix
@@ -37,7 +37,6 @@ let
// {
inherit privateTmp;
- multiArch = true;
includeClosures = true;
# https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#command-line-tools
@@ -50,7 +49,6 @@ let
file
lsb-release # not documented, called from Big Picture
pciutils # not documented, complains about lspci on startup
- glibc_multi.bin
xdg-utils # calls xdg-open occasionally
xz
zenity
@@ -66,14 +64,8 @@ let
mkdir -p $out
ln -s ${xorg.libX11}/share $out/share
'')
- ]
- ++ extraPkgs pkgs;
- # https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#shared-libraries
- multiPkgs =
- pkgs:
- with pkgs;
- [
+ # https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#shared-libraries
glibc
libxcrypt
libGL
@@ -90,6 +82,7 @@ let
# FIXME: figure out how to only build libnm?
libcap # not documented, required by srt-bwrap
]
+ ++ extraPkgs pkgs
++ extraLibraries pkgs;
profile = ''
@@ -109,10 +102,10 @@ let
export GTK_IM_MODULE='xim'
# See https://gitlab.steamos.cloud/steamrt/steam-runtime-tools/-/blob/main/docs/distro-assumptions.md#graphics-driver
- export LIBGL_DRIVERS_PATH=/run/opengl-driver/lib/dri:/run/opengl-driver-32/lib/dri
- export __EGL_VENDOR_LIBRARY_DIRS=/run/opengl-driver/share/glvnd/egl_vendor.d:/run/opengl-driver-32/share/glvnd/egl_vendor.d
- export LIBVA_DRIVERS_PATH=/run/opengl-driver/lib/dri:/run/opengl-driver-32/lib/dri
- export VDPAU_DRIVER_PATH=/run/opengl-driver/lib/vdpau:/run/opengl-driver-32/lib/vdpau
+ export LIBGL_DRIVERS_PATH=/run/opengl-driver/lib/dri
+ export __EGL_VENDOR_LIBRARY_DIRS=/run/opengl-driver/share/glvnd/egl_vendor.d
+ export LIBVA_DRIVERS_PATH=/run/opengl-driver/lib/dri
+ export VDPAU_DRIVER_PATH=/run/opengl-driver/lib/vdpau
# Steam gets confused by the symlinks to bind mounts to symlinks /etc/localtime ends up being, so help it out.
# See also: https://github.com/flathub/com.valvesoftware.Steam/blob/28481f09f33c12b6ac7421d13af9ed1523c54ec4/steam_wrapper/steam_wrapper.py#L160