nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-10-30 22:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

steamPackages.steam-fhsenv: fix Proton

Browse Source 
LLVM must match version required by Mesa.

Fixes https://github.com/NixOS/nixpkgs/issues/127068
This commit is contained in:
TredwellGit 2021-07-10 02:19:27 +00:00 committed by Jonathan Ringer
parent eb7b4bafc5
commit 79a4590495
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

@ -220,6 +220,7 @@ self = stdenv.mkDerivation {
passthru = { passthru = {
inherit libdrm; inherit libdrm;
inherit (libglvnd) driverLink; inherit (libglvnd) driverLink;
inherit llvmPackages;
tests.devDoesNotDependOnLLVM = stdenv.mkDerivation { tests.devDoesNotDependOnLLVM = stdenv.mkDerivation {
name = "mesa-dev-does-not-depend-on-llvm"; 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 # dependencies for mesa drivers, needed inside pressure-vessel
mesa.drivers mesa.drivers
mesa.llvmPackages.llvm.lib
vulkan-loader vulkan-loader
expat expat
wayland wayland
@ -157,7 +158,6 @@ in buildFHSUserEnv rec {
xorg.libXdamage xorg.libXdamage
xorg.libxshmfence xorg.libxshmfence
xorg.libXxf86vm xorg.libXxf86vm
llvm_11.lib
libelf libelf
] ++ (if (!nativeOnly) then [ ] ++ (if (!nativeOnly) then [
(steamPackages.steam-runtime-wrapped.override { (steamPackages.steam-runtime-wrapped.override {