diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-03-15 04:22:27 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-03-15 04:55:48 +0100 |
commit | 74ca4a9f0747862d968d7e36526a5b3c9750fec7 (patch) | |
tree | 91f49366a1d445f9ef432c83f3c8b12ae1001295 | |
parent | 5f0b5bba153b2169c7ca4e5bcaafdabbe2cb6d8a (diff) |
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 <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/default.nix | 5 | ||||
-rw-r--r-- | pkgs/games/base-module.nix | 2 | ||||
-rw-r--r-- | pkgs/games/default.nix | 7 |
3 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/default.nix b/pkgs/default.nix index 6eec67a4..ad4e8e25 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -24,6 +24,11 @@ let tomahawk = callPackage ./tomahawk { qt5 = pkgs.qt55; }; twitchstream = callPackage ./twitchstream { }; + games = import ./games { + inherit pkgs; + config = pkgs.config.vuizvui.games or null; + }; + kernelPatches = { bfqsched = callPackage ./kpatches/bfqsched { }; }; diff --git a/pkgs/games/base-module.nix b/pkgs/games/base-module.nix index 08855379..934893c1 100644 --- a/pkgs/games/base-module.nix +++ b/pkgs/games/base-module.nix @@ -10,6 +10,4 @@ with lib; description = "Available NixGames packages."; }; }; - - config._module.args.pkgs = import <nixpkgs> {}; } 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 <nixpkgs> {} }: let configFilePath = let @@ -17,9 +17,10 @@ let } '' else configFilePath; -in ((import <nixpkgs/lib>).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 |