diff options
author | Nikolay Amiantov <ab@fmap.me> | 2018-02-14 14:01:57 +0300 |
---|---|---|
committer | Nikolay Amiantov <ab@fmap.me> | 2018-03-11 02:14:49 +0300 |
commit | 8332b7aef91fc390c2a82deacc857044f29a6935 (patch) | |
tree | 0ddbe547fb15125d91ef68a10f1f5fefaca754d5 /pkgs/games/steam | |
parent | 9db2a3e63859532b0b395a9786f513bd1a78bf36 (diff) | |
download | nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.tar nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.tar.gz nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.tar.bz2 nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.tar.lz nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.tar.xz nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.tar.zst nixpkgs-8332b7aef91fc390c2a82deacc857044f29a6935.zip |
steam: don't add zoneinfo manually
We already have this done for FHS environments in general.
Diffstat (limited to 'pkgs/games/steam')
-rw-r--r-- | pkgs/games/steam/chrootenv.nix | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index 49d786284da..8fd8c3d7d20 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -9,16 +9,7 @@ let commonTargetPkgs = pkgs: with pkgs; - let - tzdir = "${pkgs.tzdata}/share/zoneinfo"; - # I'm not sure if this is the best way to add things like this - # to an FHSUserEnv - etc-zoneinfo = pkgs.runCommand "zoneinfo" {} '' - mkdir -p $out/etc - ln -s ${tzdir} $out/etc/zoneinfo - ln -s ${tzdir}/UTC $out/etc/localtime - ''; - in [ + [ steamPackages.steam-fonts # Errors in output without those pciutils @@ -30,8 +21,6 @@ let perl # Open URLs xdg_utils - # Zoneinfo - etc-zoneinfo iana-etc ] ++ lib.optional withJava jdk ++ lib.optional withPrimus primus @@ -103,7 +92,6 @@ in buildFHSUserEnv rec { profile = '' export STEAM_RUNTIME=/steamrt - export TZDIR=/etc/zoneinfo ''; runScript = writeScript "steam-wrapper.sh" '' |