about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--pkgs/default.nix5
-rw-r--r--pkgs/games/base-module.nix2
-rw-r--r--pkgs/games/default.nix7
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