Merge pull request #114884 from LuigiPiucco/pressure-vessel

steam: continuation of #114024 with missing edits
This commit is contained in:
Bernardo Meurer 2021-03-03 01:53:16 +00:00 committed by GitHub
commit dddf7b7806
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions

View file

@ -17,6 +17,7 @@ in {
config = mkIf cfg.enable {
hardware.opengl = { # this fixes the "glXChooseVisual failed" bug, context: https://github.com/NixOS/nixpkgs/issues/47932
enable = true;
driSupport = true;
driSupport32Bit = true;
};

View file

@ -140,6 +140,7 @@ in buildFHSUserEnv rec {
# dependencies for mesa drivers, needed inside pressure-vessel
mesa.drivers
vulkan-loader
expat
wayland
xlibs.libxcb
@ -232,7 +233,14 @@ in buildFHSUserEnv rec {
libvdpau
] ++ steamPackages.steam-runtime-wrapped.overridePkgs) ++ extraLibraries pkgs;
extraBuildCommands = if (!nativeOnly) then ''
extraBuildCommands = ''
if [ -f $out/usr/share/vulkan/icd.d/nvidia_icd.json ]; then
cp $out/usr/share/vulkan/icd.d/nvidia_icd{,32}.json
nvidia32Lib=$(realpath $out/lib32/libGLX_nvidia.so.0 | cut -d'/' -f-4)
escapedNvidia32Lib="''${nvidia32Lib//\//\\\/}"
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
fi
'' + (if (!nativeOnly) then ''
mkdir -p steamrt
ln -s ../lib/steam-runtime steamrt/${steam-runtime-wrapped.arch}
${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
@ -245,7 +253,7 @@ in buildFHSUserEnv rec {
${lib.optionalString (steam-runtime-wrapped-i686 != null) ''
ln -s /usr/lib32/libbz2.so usr/lib32/libbz2.so.1.0
''}
'';
'');
extraInstallCommands = ''
mkdir -p $out/share/applications