steam: don't add zoneinfo manually
We already have this done for FHS environments in general.
This commit is contained in:
parent
9db2a3e638
commit
8332b7aef9
@ -9,16 +9,7 @@
|
|||||||
|
|
||||||
let
|
let
|
||||||
commonTargetPkgs = pkgs: with pkgs;
|
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
|
steamPackages.steam-fonts
|
||||||
# Errors in output without those
|
# Errors in output without those
|
||||||
pciutils
|
pciutils
|
||||||
@ -30,8 +21,6 @@ let
|
|||||||
perl
|
perl
|
||||||
# Open URLs
|
# Open URLs
|
||||||
xdg_utils
|
xdg_utils
|
||||||
# Zoneinfo
|
|
||||||
etc-zoneinfo
|
|
||||||
iana-etc
|
iana-etc
|
||||||
] ++ lib.optional withJava jdk
|
] ++ lib.optional withJava jdk
|
||||||
++ lib.optional withPrimus primus
|
++ lib.optional withPrimus primus
|
||||||
@ -103,7 +92,6 @@ in buildFHSUserEnv rec {
|
|||||||
|
|
||||||
profile = ''
|
profile = ''
|
||||||
export STEAM_RUNTIME=/steamrt
|
export STEAM_RUNTIME=/steamrt
|
||||||
export TZDIR=/etc/zoneinfo
|
|
||||||
'';
|
'';
|
||||||
|
|
||||||
runScript = writeScript "steam-wrapper.sh" ''
|
runScript = writeScript "steam-wrapper.sh" ''
|
||||||
|
Loading…
x
Reference in New Issue
Block a user