From 79a4590495310379f5e55f89296bf213da441427 Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Sat, 10 Jul 2021 02:19:27 +0000 Subject: [PATCH] steamPackages.steam-fhsenv: fix Proton LLVM must match version required by Mesa. Fixes https://github.com/NixOS/nixpkgs/issues/127068 --- pkgs/development/libraries/mesa/default.nix | 1 + pkgs/games/steam/fhsenv.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index aaa78de47f75..725451da9435 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -220,6 +220,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 a0557eed9b12..b2c303caa54f 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 {