Merge pull request #94442 from Atemu/buildFHSUserEnvBw

This commit is contained in:
Jörg Thalheim
2020-08-19 17:28:02 +01:00
committed by GitHub
7 changed files with 309 additions and 8 deletions
+3 -2
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 { };
};