Merge pull request #227682 from wegank/steam-i686

2023-04-23 01:09:09 +03:00
parent dedd7f4b42 db9eda0945
commit 2282f5aa1d
1 changed files with 5 additions and 2 deletions
@@ -1,5 +1,5 @@
 { makeScopeWithSplicing, generateSplicesForMkScope
-, stdenv, buildFHSEnv, pkgsi686Linux
+, stdenv, buildFHSEnv, pkgsi686Linux, glxinfo
 }:

 let
@@ -14,7 +14,10 @@ let
    steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
    steam = callPackage ./steam.nix { };
    steam-fhsenv = callPackage ./fhsenv.nix {
-      glxinfo-i686 = pkgsi686Linux.glxinfo;
+      glxinfo-i686 =
+        if self.steamArch == "amd64"
+        then pkgsi686Linux.glxinfo
+        else glxinfo;
      steam-runtime-wrapped-i686 =
        if self.steamArch == "amd64"
        then pkgsi686Linux.steamPackages.steam-runtime-wrapped