aboutsummaryrefslogtreecommitdiff
path: root/modules/misc/nixpkgs.nix
diff options
context:
space:
mode:
authorYurii Rashkovskii <me@yrashk.com>2019-01-28 13:09:28 +0700
committerRobert Helgesson <robert@rycee.net>2019-01-29 20:15:18 +0100
commit2410bc603bd13746bc0c0591d1e70ced55bd0f85 (patch)
treec3194f98fa6f8d88aa8647a2ca6591d598113bee /modules/misc/nixpkgs.nix
parent45cadbd4f304a3dcb7b3fcd47032a39fac715f6f (diff)
nixpkgs: fix installation on non-x86
On non-x86 architectures (for example, aarch64) the installation of home-manager fails indicating that it is attempting to select i686 packages for Linux and those aren't available. Solution: make the condition for choosing these packages stricter
Diffstat (limited to 'modules/misc/nixpkgs.nix')
-rw-r--r--modules/misc/nixpkgs.nix5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/misc/nixpkgs.nix b/modules/misc/nixpkgs.nix
index 287a74b201e..150cbe74093 100644
--- a/modules/misc/nixpkgs.nix
+++ b/modules/misc/nixpkgs.nix
@@ -144,7 +144,10 @@ in
config = {
_module.args = {
pkgs = _pkgs;
- pkgs_i686 = if _pkgs.stdenv.isLinux then _pkgs.pkgsi686Linux else {};
+ pkgs_i686 =
+ if _pkgs.stdenv.isLinux && _pkgs.stdenv.hostPlatform.isx86
+ then _pkgs.pkgsi686Linux
+ else { };
};
};
}