diff options
| author | Atemu <atemu.main@gmail.com> | 2020-07-31 14:52:12 +0200 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2020-08-17 08:49:39 +0200 |
| commit | b7c09b50ffabd19ba5ffe32d768e382254737a7c (patch) | |
| tree | 8ca6b91bd3ced82f0c28ff9c18349e34e47b0ece /pkgs/games | |
| parent | 8c91b3c5b76ca54e23ab2af29ae2546381155f7b (diff) | |
| download | nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.tar nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.tar.gz nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.tar.bz2 nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.tar.lz nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.tar.xz nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.tar.zst nixpkgs-b7c09b50ffabd19ba5ffe32d768e382254737a7c.zip | |
steam: use buildFHSUserEnvBubblewrap
Fixes #92798
Diffstat (limited to 'pkgs/games')
| -rw-r--r-- | pkgs/games/steam/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/games/steam/fhsenv.nix (renamed from pkgs/games/steam/chrootenv.nix) | 0 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 5aab54b8322..ff2c6e13288 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -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 { }; }; diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/fhsenv.nix index 2c7cde78c43..2c7cde78c43 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/fhsenv.nix |