From f090bbb248c547c0aa883c46253c62050b5c797a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sun, 11 Feb 2018 14:55:17 -0600 Subject: [PATCH] Drop "isGlibc", but keep isMusl. gnu "abi" doesn't mean glibc (mingw, apparently). --- lib/systems/default.nix | 3 +-- lib/systems/inspect.nix | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/systems/default.nix b/lib/systems/default.nix index ffd14b4e85b..0729cc7ef29 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -26,8 +26,7 @@ rec { libc = /**/ if final.isDarwin then "libSystem" else if final.isMinGW then "msvcrt" - else if final.isLinux && final.isGlibc then "glibc" - else if final.isLinux && final.isMusl then "musl" + else if final.isMusl then "musl" else if final.isLinux /* default */ then "glibc" # TODO(@Ericson2314) think more about other operating systems else "native/impure"; diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 487729423a1..0fce5254dcb 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -35,7 +35,6 @@ rec { MinGW = { kernel = kernels.windows; abi = abis.gnu; }; Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; - Glibc = with abis; map (a: { abi = a; }) [ gnu gnueabi gnueabihf ]; }; matchAnyAttrs = patterns: