diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-04 12:49:09 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-04 12:49:09 -0600 |
| commit | 2b604c2836f37740947c4da85497261154026beb (patch) | |
| tree | 6acb2da15fb6bb917287f8d02dfc13417ed6b819 /pkgs | |
| parent | dc0af4d7b6e329e70206c1fbba709194d98e0a95 (diff) | |
| parent | 370ce8fcd39a3ed1002db0d7fb281576e39fc4ef (diff) | |
| download | nixlib-2b604c2836f37740947c4da85497261154026beb.tar nixlib-2b604c2836f37740947c4da85497261154026beb.tar.gz nixlib-2b604c2836f37740947c4da85497261154026beb.tar.bz2 nixlib-2b604c2836f37740947c4da85497261154026beb.tar.lz nixlib-2b604c2836f37740947c4da85497261154026beb.tar.xz nixlib-2b604c2836f37740947c4da85497261154026beb.tar.zst nixlib-2b604c2836f37740947c4da85497261154026beb.zip | |
Merge pull request #49670 from matthewbauer/pkgs-i686-remove
Fix pkgsi686Linux assertion
Diffstat (limited to 'pkgs')
| -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 37724a870a30..4e6531286ee5 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 |