diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:58:58 -0500 |
|---|---|---|
| committer | Matthew Bauer <mjbauer95@gmail.com> | 2018-11-03 00:58:58 -0500 |
| commit | 370ce8fcd39a3ed1002db0d7fb281576e39fc4ef (patch) | |
| tree | db863634cdd9112ce164daca4b523fbecc5e6ef2 /pkgs/top-level/stage.nix | |
| parent | 4a8fc5b9aaa486e6bd5f81a60c3def4be675b4ed (diff) | |
| download | nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.tar nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.tar.gz nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.tar.bz2 nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.tar.lz nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.tar.xz nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.tar.zst nixpkgs-370ce8fcd39a3ed1002db0d7fb281576e39fc4ef.zip | |
stage.nix: throw error on incorrect pkgsi686Linux usage
pkgsi686Linux now throws an error with a message as opposed to the previous assertion.
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 f838d707b0c..4e6531286ee 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 && 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 |