diff options
| author | David McFarland <mcfarland@hotmail.com> | 2017-04-26 13:20:38 -0300 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-26 18:20:38 +0200 |
| commit | 7deb425286c74837946917888ed74a23de1f9f68 (patch) | |
| tree | 5f3bf923287a43f8601f6f617b37d2e366427104 /nixos/modules/misc/nixpkgs.nix | |
| parent | a4fc2eed593b4186509de469b3a987da1157ef86 (diff) | |
| download | nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.tar nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.tar.gz nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.tar.bz2 nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.tar.lz nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.tar.xz nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.tar.zst nixpkgs-7deb425286c74837946917888ed74a23de1f9f68.zip | |
nixos: use pkgsi686Linux for pkgs_i686 (#24772)
Diffstat (limited to 'nixos/modules/misc/nixpkgs.nix')
| -rw-r--r-- | nixos/modules/misc/nixpkgs.nix | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix index b8824e6374b..1793c1447d6 100644 --- a/nixos/modules/misc/nixpkgs.nix +++ b/nixos/modules/misc/nixpkgs.nix @@ -42,6 +42,8 @@ let merge = lib.mergeOneOption; }; + _pkgs = import ../../.. config.nixpkgs; + in { @@ -97,6 +99,9 @@ in }; config = { - _module.args.pkgs = import ../../.. config.nixpkgs; + _module.args = { + pkgs = _pkgs; + pkgs_i686 = _pkgs.pkgsi686Linux; + }; }; } |