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/games/default.nix | 7 ++++--- pkgs/games/gog/default.nix | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'pkgs/games') 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 {} }: +{ config ? null, pkgs ? import {} +, 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 {}; -- cgit 1.4.1