aboutsummaryrefslogtreecommitdiff
path: root/modules/misc/nixpkgs.nix
diff options
context:
space:
mode:
authorMario Rodas <marsam@users.noreply.github.com>2018-07-12 19:10:01 -0500
committerRobert Helgesson <robert@rycee.net>2018-07-13 19:26:08 +0200
commit092706eff85aa4501994016375693320ef9d2e7b (patch)
treeebfe91bd139ba3cc95ae3262e2453f190f287dcc /modules/misc/nixpkgs.nix
parentf4a1a5e94c448df35da24bdd13ba96d021aef6d0 (diff)
nixpkgs: only pass pkgs_i686 argument on Linux
Nixpkgs added an assertion on pkgsi686Linux [1] to avoid evaluating it pkgsi686Linux on non-Linux systems. [1] https://github.com/nixos/nixpkgs/commit/ad20a4a1c328967c7e4abe211f3dd63bb68bf966
Diffstat (limited to 'modules/misc/nixpkgs.nix')
-rw-r--r--modules/misc/nixpkgs.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index f51588f9d3e..287a74b201e 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -144,7 +144,7 @@ in
config = {
_module.args = {
pkgs = _pkgs;
- pkgs_i686 = _pkgs.pkgsi686Linux;
+ pkgs_i686 = if _pkgs.stdenv.isLinux then _pkgs.pkgsi686Linux else {};
};
};
}