@@ -243,14 +243,7 @@ in buildFHSUserEnv rec {
243243 libvdpau
244244 ] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs;
245245
246− extraBuildCommands = ''
247− if [ -f $out/usr/share/vulkan/icd.d/nvidia_icd.json ]; then
248− cp $out/usr/share/vulkan/icd.d/nvidia_icd{,32}.json
249− nvidia32Lib=$(realpath $out/lib32/libGLX_nvidia.so.0 | cut -d'/' -f-4)
250− escapedNvidia32Lib="''${nvidia32Lib//\//\\\/}"
251− sed -i "s/\/nix\/store\/.*\/lib\/libGLX_nvidia\.so\.0/$escapedNvidia32Lib\/lib\/libGLX_nvidia\.so\.0/g" $out/usr/share/vulkan/icd.d/nvidia_icd32.json
252− fi
253− '' + (if (!nativeOnly) then ''
246+ extraBuildCommands = if (!nativeOnly) then ''
254247 mkdir -p steamrt
255248 ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch}
256249 ${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
@@ -263,7 +256,7 @@ in buildFHSUserEnv rec {
263256 ${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
264257 ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
265258 ''}
266− '');
259+ '';
267260
268261 extraInstallCommands = ''
269262 mkdir -p $out/share/applications
@@ -284,7 +277,8 @@ in buildFHSUserEnv rec {
284277
285278 export STEAM_RUNTIME=${if nativeOnly then "0" else "/steamrt"}
286279
287− export VK_ICD_FILENAMES=/usr/share/vulkan/icd.d/intel_icd.x86_64.json:/usr/share/vulkan/icd.d/intel_icd.i686.json:/usr/share/vulkan/icd.d/lvp_icd.x86_64.json:/usr/share/vulkan/icd.d/lvp_icd.i686.json:/usr/share/vulkan/icd.d/nvidia_icd.json:/usr/share/vulkan/icd.d/nvidia_icd32.json:/usr/share/vulkan/icd.d/radeon_icd.x86_64.json:/usr/share/vulkan/icd.d/radeon_icd.i686.json
280+ # XDG_DATA_DIRS is used by pressure-vessel and vulkan loaders to find the corresponding icd
281+ export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share
288282 '' + extraProfile;
289283
290284 runScript = writeScript "steam-wrapper.sh" ''