From 5402b030e2cc78e510414b4604d9528afbec43d2 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 10 Sep 2017 07:35:28 +0200 Subject: pkgs/games: Inline base-module.nix This is such a short expression that really shouldn't belong in its own file, so that everything we want to know is there in default.nix. Signed-off-by: aszlig --- pkgs/games/base-module.nix | 13 ------------- pkgs/games/default.nix | 12 +++++++++++- 2 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 pkgs/games/base-module.nix (limited to 'pkgs/games') diff --git a/pkgs/games/base-module.nix b/pkgs/games/base-module.nix deleted file mode 100644 index 934893c1..00000000 --- a/pkgs/games/base-module.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, ... }: - -with lib; - -{ - options = { - packages = mkOption { - type = types.attrsOf types.unspecified; - default = {}; - description = "Available NixGames packages."; - }; - }; -} diff --git a/pkgs/games/default.nix b/pkgs/games/default.nix index 9222be86..cef568cf 100644 --- a/pkgs/games/default.nix +++ b/pkgs/games/default.nix @@ -17,10 +17,20 @@ let } '' else configFilePath; + baseModule = { lib, ... }: { + options = { + packages = lib.mkOption { + type = lib.types.attrsOf lib.types.unspecified; + default = {}; + description = "Available collections of games."; + }; + }; + }; + in (pkgs.lib.evalModules { modules = [ (if config == null then configFilePath else config) - ./base-module.nix ./humblebundle ./steam ./itch + baseModule ./humblebundle ./steam ./itch { config._module.args.pkgs = pkgs; } ]; }).config.packages -- cgit 1.4.1