diff options
| author | Nikolay Amiantov <ab@fmap.me> | 2015-02-05 19:43:20 +0300 |
|---|---|---|
| committer | Nikolay Amiantov <ab@fmap.me> | 2015-02-05 19:46:25 +0300 |
| commit | 627f8178b8b779b639a64716dbe13c7a64ad56f0 (patch) | |
| tree | 565c46b724d9ee6525173ba552aafd3b74dba6dc | |
| parent | 238fe730b94ee163adfd5133870f30e34e1fc5e6 (diff) | |
| download | nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.tar nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.tar.gz nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.tar.bz2 nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.tar.lz nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.tar.xz nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.tar.zst nixlib-627f8178b8b779b639a64716dbe13c7a64ad56f0.zip | |
steam: rename, add a warning
| -rw-r--r-- | pkgs/games/steam/chrootenv.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 12 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 8220e24147ed..7ebd07752920 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -4,7 +4,7 @@ buildFHSUserEnv { name = "steam"; targetPkgs = pkgs: - [ pkgs.steam + [ pkgs.steamOriginal pkgs.corefonts pkgs.curl pkgs.dbus diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 123d7164862a..37b5f45412b0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12153,9 +12153,17 @@ let stardust = callPackage ../games/stardust {}; - steam = callPackage ../games/steam {}; + steamOriginal = callPackage ../games/steam { }; - steamChrootEnv = callPackage ../games/steam/chrootenv.nix { }; + steam = callPackage ../games/steam/chrootenv.nix { }; + + steamChrootEnv = steam.overrideDerivation (args: { + buildCommand = '' + ${args.buildCommand} + echo >&2 "'steamChrootEnv' is replaced with 'steam' now" + echo >&2 "You now need just to run 'steam' without root rights" + ''; + }); stuntrally = callPackage ../games/stuntrally { }; |