From f46b8b594e6fbe73b621b963d515014eb9d85134 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 4 Jul 2018 02:37:11 +0200 Subject: pkgs: Fix passing through i686-linux package set So far in the games namespace we have just used the callPackage_i686 function from instead of our augmented set. If we just use packages that are available in 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 --- pkgs/default.nix | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/default.nix') 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; }; -- cgit 1.4.1