From fcde869e7e0514817ea3dc8cd21c45f2c9e3bb86 Mon Sep 17 00:00:00 2001 From: John Ericson Date: Thu, 27 Apr 2017 13:29:41 -0400 Subject: 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 --- lib/systems/doubles.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/systems/doubles.nix') diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index 2622ddf4be1f..9b17a51531a3 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 -- cgit 1.4.1