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

stage: add Linux checks

Browse Source 
This prevent us evaluation on macOS systems where pkgsMusl &
pkgsi686Linux is unsupported.
This commit is contained in:
Matthew Bauer 2018-07-05 17:32:54 -04:00
parent f795ed79d0
commit ad20a4a1c3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,7 +137,7 @@ let
# All packages built with the Musl libc. This will override the # All packages built with the Musl libc. This will override the
# default GNU libc on Linux systems. Non-Linux systems are not # default GNU libc on Linux systems. Non-Linux systems are not
# supported. # supported.
pkgsMusl = nixpkgsFun { pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
localSystem = { localSystem = {
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {
abi = { abi = {
@ -147,11 +147,11 @@ let
}.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl; }.${stdenv.hostPlatform.parsed.abi.name} or lib.systems.parse.abis.musl;
}; };
}; };
}; } else throw "Musl libc only supports Linux systems.";
# All packages built for i686 Linux. # All packages built for i686 Linux.
# Used by wine, firefox with debugging version of Flash, ... # Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = nixpkgsFun { pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
localSystem = { localSystem = {
parsed = stdenv.hostPlatform.parsed // { parsed = stdenv.hostPlatform.parsed // {
cpu = lib.systems.parse.cpuTypes.i686; cpu = lib.systems.parse.cpuTypes.i686;