public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

steamPackages.steam-fhsenv: fix Proton 

LLVM must match version required by Mesa.

Fixes https://github.com/NixOS/nixpkgs/issues/127068

(cherry picked from commit b4d3ea24beddd761a40020e043fbe2979c518dbf)
This commit is contained in:
TredwellGit 2021-07-10 02:19:27 +00:00 committed by Jonathan Ringer
parent 0379b62657
commit 8b39c06e41
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/libraries/mesa/default.nix
View File

@ -214,6 +214,7 @@ self = stdenv.mkDerivation {
passthru = {
inherit libdrm;
inherit (libglvnd) driverLink;
inherit llvmPackages;
tests.devDoesNotDependOnLLVM = stdenv.mkDerivation {
name = "mesa-dev-does-not-depend-on-llvm";

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

@ -150,6 +150,7 @@ in buildFHSUserEnv rec {
# dependencies for mesa drivers, needed inside pressure-vessel
mesa.drivers
mesa.llvmPackages.llvm.lib
vulkan-loader
expat
wayland
@ -157,7 +158,6 @@ in buildFHSUserEnv rec {
xorg.libXdamage
xorg.libxshmfence
xorg.libXxf86vm
llvm_11.lib
libelf
] ++ (if (!nativeOnly) then [
(steamPackages.steam-runtime-wrapped.override {