diff options
| author | John Ericson <Ericson2314@Yahoo.com> | 2017-04-27 13:29:41 -0400 |
|---|---|---|
| committer | John Ericson <Ericson2314@Yahoo.com> | 2017-04-27 14:30:42 -0400 |
| commit | fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86 (patch) | |
| tree | 3ed1da71d53e3daacbdf7dc48f81994c7df14d92 /lib/systems/doubles.nix | |
| parent | 7d546d777109a448bb3bd80b67923326586fef31 (diff) | |
| download | nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.tar nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.tar.gz nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.tar.bz2 nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.tar.lz nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.tar.xz nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.tar.zst nixpkgs-fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86.zip | |
lib platform parsing: Fix windows
There is no more `cygwin` OS, but instead a `cygnus` abi. "win32" and "mingw32" parse as `windows`. Add a 3-part hack because autotools breaks on explicit abi with windows-like (e.g. "i686-pc-windows-gnu"). Also change cross triples to conform
Diffstat (limited to 'lib/systems/doubles.nix')
| -rw-r--r-- | lib/systems/doubles.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 2622ddf4be1..9b17a51531a 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -30,7 +30,7 @@ in rec { mips = filterDoubles (matchAttrs { cpu = { family = "mips"; }; }); x86_64 = filterDoubles parse.isx86_64; - cygwin = filterDoubles (matchAttrs { kernel = parse.kernels.cygwin; }); + cygwin = filterDoubles parse.isCygwin; darwin = filterDoubles parse.isDarwin; freebsd = filterDoubles (matchAttrs { kernel = parse.kernels.freebsd; }); gnu = filterDoubles (matchAttrs { kernel = parse.kernels.linux; abi = parse.abis.gnu; }); # Should be better |