From 96a14a62bfe2ab98320c8c17db88aba1506847e9 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Wed, 13 Sep 2017 07:32:20 +0200
Subject: pkgs/games: Add build-support for pkgsi686Linux

So far we only had all the functions within build-support for
builtins.currentSystem, but a few games we have within Vuizvui are still
i686-linux.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 pkgs/games/default.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

(limited to 'pkgs/games/default.nix')

diff --git a/pkgs/games/default.nix b/pkgs/games/default.nix
index 530ac5de..555d6b6e 100644
--- a/pkgs/games/default.nix
+++ b/pkgs/games/default.nix
@@ -27,11 +27,16 @@ let
     };
 
     config._module.args.pkgs = let
-      buildSupport = import ./build-support {
-        inherit (pkgs) config;
-        callPackage = lib.callPackageWith (pkgs // buildSupport);
-      };
-    in buildSupport // pkgs;
+      mkBuildSupport = super: let
+        self = import ./build-support {
+          inherit (super) config;
+          callPackage = lib.callPackageWith (super // self);
+        };
+      in self;
+    in pkgs // (mkBuildSupport pkgs) // {
+      pkgsi686Linux = pkgs.pkgsi686Linux
+                   // (mkBuildSupport pkgs.pkgsi686Linux);
+    };
   };
 
 in (pkgs.lib.evalModules {
-- 
cgit 1.4.1