diff options
| author | Robert Hensing <robert@roberthensing.nl> | 2018-11-04 21:33:16 +0100 |
|---|---|---|
| committer | Robert Hensing <robert@roberthensing.nl> | 2018-11-04 21:33:16 +0100 |
| commit | 51c6f51390ba3c0bfefc1bf8437cb265c92395f4 (patch) | |
| tree | f6ee5a97d98eea816aa8c862251db6a25b69294b /pkgs/top-level/stage.nix | |
| parent | 03fc1167e87b16a736d6daedada33d2b0c75f62c (diff) | |
| parent | 14a9365952fcac6214b78a3b1f553961ad2f0a69 (diff) | |
| download | nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.gz nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.bz2 nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.lz nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.xz nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.tar.zst nixpkgs-51c6f51390ba3c0bfefc1bf8437cb265c92395f4.zip | |
Merge remote-tracking branch 'upstream/master' into nixos-nixpkgs-pkgs-use-overlays
Diffstat (limited to 'pkgs/top-level/stage.nix')
| -rw-r--r-- | pkgs/top-level/stage.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index d270a6608a1..1d412a6582c 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 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86 then nixpkgsFun { inherit overlays config; ${if stdenv.hostPlatform == stdenv.buildPlatform then "localSystem" else "crossSystem"} = { @@ -158,7 +158,7 @@ let cpu = lib.systems.parse.cpuTypes.i686; }; }; - }; + } else throw "i686 Linux package set can only be used with the x86 family."; # Extend the package set with zero or more overlays. This preserves # preexisting overlays. Prefer to initialize with the right overlays |