pkgs: Fix passing through i686-linux package set

So far in the games namespace we have just used the callPackage_i686
function from <nixpkgs> instead of our augmented set.

If we just use packages that are available in <nixpkgs> everything is
fine, but as soon as we want to use one of our own packages for
i686-linux we can't simply do that.

One example is the override in the gog.albion derivation which just uses
buildSandbox from the main pkgs attribute set.

We now properly pass through the whole pkgsi686Linux set to the games
namespace, so we can drop that hack for Albion.

Signed-off-by: aszlig <aszlig@nix.build>

3 files changed, 6 insertions, 4 deletions

diff --git a/pkgs/default.nix b/pkgs/default.nix
index 9126d382..070ae786 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -18,6 +18,7 @@ let
 
     games = import ./games {
       pkgs = pkgs // self.vuizvui;
+      pkgsi686Linux = pkgs.pkgsi686Linux // self.vuizvui;
       config = pkgs.config.vuizvui.games or null;
     };
 
diff --git a/pkgs/games/default.nix b/pkgs/games/default.nix
index ae86d30e..bead9271 100644
--- a/pkgs/games/default.nix
+++ b/pkgs/games/default.nix
@@ -1,4 +1,6 @@
-{ config ? null, pkgs ? import <nixpkgs> {} }:
+{ config ? null, pkgs ? import <nixpkgs> {}
+, pkgsi686Linux ? pkgs.pkgsi686Linux
+}:
 
 let
   configFilePath = let
@@ -34,8 +36,7 @@ let
     };
 
     config._module.args.pkgs = pkgs // (mkBuildSupport pkgs) // {
-      pkgsi686Linux = pkgs.pkgsi686Linux
-                   // (mkBuildSupport pkgs.pkgsi686Linux);
+      pkgsi686Linux = pkgsi686Linux // (mkBuildSupport pkgsi686Linux);
     };
   };
 
diff --git a/pkgs/games/gog/default.nix b/pkgs/games/gog/default.nix
index 99cf2d2e..38ebf489 100644
--- a/pkgs/games/gog/default.nix
+++ b/pkgs/games/gog/default.nix
@@ -11,7 +11,7 @@ let
       inherit (config.gog) email password;
     };
 
-    albion = callPackage_i686 ./albion { inherit (pkgs) buildSandbox; };
+    albion = callPackage_i686 ./albion {};
     dungeons3 = callPackage ./dungeons3.nix {};
     overload = callPackage ./overload.nix {};
     party-hard = callPackage ./party-hard.nix {};