Skip to content

Commit

Permalink
stage: add Linux checks
Browse files Browse the repository at this point in the history
This prevent us evaluation on macOS systems where pkgsMusl &
pkgsi686Linux is unsupported.
  • Loading branch information
matthewbauer committed Jul 5, 2018
1 parent f795ed7 commit ad20a4a
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions pkgs/top-level/stage.nix
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ let
# All packages built with the Musl libc. This will override the
# default GNU libc on Linux systems. Non-Linux systems are not
# supported.
pkgsMusl = nixpkgsFun {
pkgsMusl = if stdenv.hostPlatform.isLinux then nixpkgsFun {
localSystem = {
parsed = stdenv.hostPlatform.parsed // {
abi = {
Expand All @@ -147,11 +147,11 @@ let
}.${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.
# Used by wine, firefox with debugging version of Flash, ...
pkgsi686Linux = nixpkgsFun {
pkgsi686Linux = assert stdenv.hostPlatform.isLinux; nixpkgsFun {
localSystem = {
parsed = stdenv.hostPlatform.parsed // {
cpu = lib.systems.parse.cpuTypes.i686;
Expand Down

1 comment on commit ad20a4a

@LisannaAtHome
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This change appears to be causing some issues for me with NixOps on darwin: NixOS/nixops#1033

Please sign in to comment.