diff options
| author | TredwellGit <tredwell@tutanota.com> | 2021-07-10 02:19:27 +0000 |
|---|---|---|
| committer | Jonathan Ringer <jonringer@users.noreply.github.com> | 2021-07-16 15:34:43 -0700 |
| commit | 8b39c06e41f7425e59ef15cfa548d0cd870fd831 (patch) | |
| tree | d65ff4c10e7ebf778eecad150ba28393bf9e2dfa | |
| parent | Merge pull request #130363 from NixOS/backport-130360-to-release-21.05 (diff) | |
| download | nixpkgs-8b39c06e41f7425e59ef15cfa548d0cd870fd831.tar.gz | |
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)
| -rw-r--r-- | pkgs/development/libraries/mesa/default.nix | 1 | ||||
| -rw-r--r-- | pkgs/games/steam/fhsenv.nix | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 2b94f9c3bb50..2eccde09d8ba 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -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"; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index fe3dde7167b5..f09330ccdde3 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -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 { |