diff options
| author | Atemu <atemu.main@gmail.com> | 2023-04-11 12:52:27 +0200 |
|---|---|---|
| committer | Atemu <atemu.main@gmail.com> | 2023-04-16 10:15:13 +0200 |
| commit | f63a12f296b806a1b838d6fd8eef99fa65929649 (patch) | |
| tree | bf9627db4a9a4a265dfccfef4e43338606d9c3e5 /pkgs/games/steam | |
| parent | 1baab4e14a6c9d5fd0f3e6af144aeeb61e911110 (diff) | |
| download | nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.tar nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.tar.gz nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.tar.bz2 nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.tar.lz nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.tar.xz nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.tar.zst nixlib-f63a12f296b806a1b838d6fd8eef99fa65929649.zip | |
tree-wide: buildFHSUserEnv -> buildFHSEnv
Diffstat (limited to 'pkgs/games/steam')
| -rw-r--r-- | pkgs/games/steam/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/games/steam/fhsenv.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/games/steam/default.nix b/pkgs/games/steam/default.nix index 9e7b815661c9..538a66dcfd74 100644 --- a/pkgs/games/steam/default.nix +++ b/pkgs/games/steam/default.nix @@ -1,5 +1,5 @@ { makeScopeWithSplicing, generateSplicesForMkScope -, stdenv, buildFHSUserEnv, pkgsi686Linux +, stdenv, buildFHSEnv, pkgsi686Linux }: let @@ -19,7 +19,7 @@ let if self.steamArch == "amd64" then pkgsi686Linux.steamPackages.steam-runtime-wrapped else null; - inherit buildFHSUserEnv; + inherit buildFHSEnv; }; steam-fhsenv-small = steam-fhsenv.override { withGameSpecificLibraries = false; }; steamcmd = callPackage ./steamcmd.nix { }; diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 8d461104eaac..4476b0c23c96 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, writeShellScript, buildFHSUserEnv, steam, glxinfo-i686 +{ lib, stdenv, writeShellScript, buildFHSEnv, steam, glxinfo-i686 , steam-runtime-wrapped, steam-runtime-wrapped-i686 ? null , extraPkgs ? pkgs: [ ] # extra packages to add to targetPkgs , extraLibraries ? pkgs: [ ] # extra packages to add to multiPkgs @@ -55,7 +55,7 @@ let envScript = lib.toShellVars extraEnv; -in buildFHSUserEnv rec { +in buildFHSEnv rec { name = "steam"; targetPkgs = pkgs: with pkgs; [ @@ -270,7 +270,7 @@ in buildFHSUserEnv rec { # breaks the ability for application to reference shared memory. unsharePid = false; - passthru.run = buildFHSUserEnv { + passthru.run = buildFHSEnv { name = "steam-run"; targetPkgs = commonTargetPkgs; |