From 74ca4a9f0747862d968d7e36526a5b3c9750fec7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 15 Mar 2016 04:22:27 +0100 Subject: pkgs: Hook in games into vuizvui package set New we can reference the games using pkgs.vuizvui.games.*, although game configuration currently still resorts to using ~/.config/nixgames.nix if there is no nixpkgs.config.vuizvui.games set. In this vein, this should also avoid Hydra to try to build those games, because those aren't publicly available for free. Signed-off-by: aszlig --- pkgs/games/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/games/default.nix') diff --git a/pkgs/games/default.nix b/pkgs/games/default.nix index d85bd191..27682563 100644 --- a/pkgs/games/default.nix +++ b/pkgs/games/default.nix @@ -1,4 +1,4 @@ -{ configuration ? null }: +{ config ? null, pkgs ? import {} }: let configFilePath = let @@ -17,9 +17,10 @@ let } '' else configFilePath; -in ((import ).evalModules { +in (pkgs.lib.evalModules { modules = [ - (if configuration == null then configFilePath else configuration) + (if config == null then configFilePath else config) ./base-module.nix ./humblebundle ./steam + { config._module.args.pkgs = pkgs; } ]; }).config.packages -- cgit 1.4.1