diff options
author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:52:14 -0500 |
---|---|---|
committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:52:14 -0500 |
commit | b3ab4d1f8e6fc6897fe561039b14d360fe8164f8 (patch) | |
tree | 127727bf6ac3cd59c3cbbe6186c5c329341418d0 /pkgs/top-level/stage.nix | |
parent | 08b5cffe878bcc7ea230043332db53a0ef8d2758 (diff) | |
download | nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.tar nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.tar.gz nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.tar.bz2 nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.tar.lz nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.tar.xz nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.tar.zst nixpkgs-b3ab4d1f8e6fc6897fe561039b14d360fe8164f8.zip |
Revert "Revert "stage.nix: pkgsi686Linux only works on x86 family""
This reverts commit 08b5cffe878bcc7ea230043332db53a0ef8d2758.
Diffstat (limited to 'pkgs/top-level/stage.nix')
-rw-r--r-- | pkgs/top-level/stage.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index 37724a870a3..f838d707b0c 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"} = { |