Skip to content

Commit

Permalink
stage.nix: pkgsi686Linux only works on x86 family
Browse files Browse the repository at this point in the history
aarch64 cpus are going to break on pkgsi686Linux packages.

See this error:

https://hydra.nixos.org/build/82962379/
  • Loading branch information
matthewbauer committed Nov 3, 2018
1 parent e9db1e2 commit 78ca6d8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion pkgs/top-level/stage.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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"} = {
Expand Down

2 comments on commit 78ca6d8

@kalbasit
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

eval is broken in #49669 and #49668 after this change.

@matthewbauer
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks- reverted in 08b5cff

Please sign in to comment.