steam: use buildFHSUserEnvBubblewrap

Fixes #92798
This commit is contained in:
Atemu 2020-07-31 14:52:12 +02:00
parent 8c91b3c5b7
commit b7c09b50ff
3 changed files with 7 additions and 4 deletions

View file

@ -1,4 +1,4 @@
{ pkgs, newScope }:
{ pkgs, newScope, buildFHSUserEnv }:
let
callPackage = newScope self;
@ -12,12 +12,13 @@ let
steam-runtime-wrapped = callPackage ./runtime-wrapped.nix { };
steam = callPackage ./steam.nix { };
steam-fonts = callPackage ./fonts.nix { };
steam-chrootenv = callPackage ./chrootenv.nix {
steam-fhsenv = callPackage ./fhsenv.nix {
glxinfo-i686 = pkgs.pkgsi686Linux.glxinfo;
steam-runtime-wrapped-i686 =
if steamArch == "amd64"
then pkgs.pkgsi686Linux.steamPackages.steam-runtime-wrapped
else null;
inherit buildFHSUserEnv;
};
steamcmd = callPackage ./steamcmd.nix { };
};

View file

@ -24673,9 +24673,11 @@ in
stockfish = callPackage ../games/stockfish { };
steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam { });
steamPackages = dontRecurseIntoAttrs (callPackage ../games/steam {
buildFHSUserEnv = buildFHSUserEnvBubblewrap;
});
steam = steamPackages.steam-chrootenv;
steam = steamPackages.steam-fhsenv;
steam-run = steam.run;
steam-run-native = (steam.override {