From a383e0f1b8f043310f570ec78bbac52cabdd8082 Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Sun, 15 Jun 2014 15:34:27 +0200 Subject: [PATCH] steam: add optional java support --- pkgs/games/steam/chrootenv.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/games/steam/chrootenv.nix b/pkgs/games/steam/chrootenv.nix index d7b8437450df..67f69aa40670 100644 --- a/pkgs/games/steam/chrootenv.nix +++ b/pkgs/games/steam/chrootenv.nix @@ -1,4 +1,4 @@ -{ buildFHSChrootEnv }: +{ buildFHSChrootEnv, config }: buildFHSChrootEnv { name = "steam"; @@ -13,7 +13,9 @@ buildFHSChrootEnv { pkgs.python pkgs.gnome2.zenity pkgs.xdg_utils - ]; + ] + ++ (if config.steam.java or false then [ pkgs.jdk ] else [ ]) + ; multiPkgs = pkgs: [ pkgs.cairo @@ -23,6 +25,7 @@ buildFHSChrootEnv { pkgs.pango pkgs.freetype + pkgs.fontconfig pkgs.xlibs.libICE pkgs.xlibs.libSM pkgs.xlibs.libX11 @@ -41,9 +44,11 @@ buildFHSChrootEnv { pkgs.xlibs.libXtst pkgs.xlibs.libXxf86vm + pkgs.ffmpeg pkgs.libpng12 pkgs.mesa pkgs.SDL + pkgs.SDL2 pkgs.libgcrypt pkgs.zlib