about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Bauer <mjbauer95@gmail.com>2018-11-02 21:22:36 -0500
committerMatthew Bauer <mjbauer95@gmail.com>2018-11-02 21:24:55 -0500
commit78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d (patch)
treee96791a6ea1bb5828fa67b7f7a52215320c38182
parente9db1e29172f478a51b34e317cc141886785e734 (diff)
downloadnixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.tar
nixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.tar.gz
nixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.tar.bz2
nixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.tar.lz
nixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.tar.xz
nixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.tar.zst
nixlib-78ca6d885ffbeba8b2cfe1fe68c3980e74fd4e5d.zip
stage.nix: pkgsi686Linux only works on x86 family
aarch64 cpus are going to break on pkgsi686Linux packages.

See this error:

https://hydra.nixos.org/build/82962379/
-rw-r--r--pkgs/top-level/stage.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix
index 37724a870a30..f838d707b0c0 100644
--- a/pkgs/top-level/stage.nix
+++ b/pkgs/top-level/stage.nix
@@ -150,7 +150,7 @@ let
 
     # All packages built for i686 Linux.
     # Used by wine, firefox with debugging version of Flash, ...
-    pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
+    pkgsi686Linux = assert stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86; nixpkgsFun {
       inherit overlays config;
       ${if stdenv.hostPlatform == stdenv.buildPlatform
         then "localSystem" else "crossSystem"} = {