From 8332b7aef91fc390c2a82deacc857044f29a6935 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 14 Feb 2018 14:01:57 +0300 Subject: [PATCH] steam: don't add zoneinfo manually We already have this done for FHS environments in general. --- pkgs/games/steam/chrootenv.nix | 14 +------------- 1 file changed, 1 insertion(+), 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" ''