colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stage.nix: throw error on incorrect pkgsi686Linux usage

Browse Source 
pkgsi686Linux now throws an error with a message as opposed to the
previous assertion.
This commit is contained in:
Matthew Bauer 2018-11-03 00:58:58 -05:00
parent 4a8fc5b9aa
commit 370ce8fcd3
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/top-level/stage.nix
View File

@ -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 && stdenv.hostPlatform.isx86; 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