diff options
author | aszlig <aszlig@redmoonstudios.org> | 2017-09-10 07:35:28 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2017-09-10 07:35:28 +0200 |
commit | 5402b030e2cc78e510414b4604d9528afbec43d2 (patch) | |
tree | c2734bc0b119a5782372317755b0eaef1d211648 | |
parent | 02dcea750b493cbf3b5ee918f338018725c29e17 (diff) |
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 <aszlig@redmoonstudios.org>
-rw-r--r-- | pkgs/games/base-module.nix | 13 | ||||
-rw-r--r-- | pkgs/games/default.nix | 12 |
2 files changed, 11 insertions, 14 deletions
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 |