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

Drop "isGlibc", but keep isMusl.

Browse Source 
gnu "abi" doesn't mean glibc (mingw, apparently).
This commit is contained in:
Will Dietz 2018-02-11 14:55:17 -06:00
parent 2dfee94fe7
commit f090bbb248
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/systems/default.nix
View File

@ -26,8 +26,7 @@ rec {
libc = libc =
/**/ if final.isDarwin then "libSystem" /**/ if final.isDarwin then "libSystem"
else if final.isMinGW then "msvcrt" else if final.isMinGW then "msvcrt"
else if final.isLinux && final.isGlibc then "glibc" else if final.isMusl then "musl"
else if final.isLinux && final.isMusl then "musl"
else if final.isLinux /* default */ then "glibc" else if final.isLinux /* default */ then "glibc"
# TODO(@Ericson2314) think more about other operating systems # TODO(@Ericson2314) think more about other operating systems
else "native/impure"; else "native/impure";

1
lib/systems/inspect.nix
View File

@ -35,7 +35,6 @@ rec {
MinGW = { kernel = kernels.windows; abi = abis.gnu; }; MinGW = { kernel = kernels.windows; abi = abis.gnu; };
Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ]; Musl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf ];
Glibc = with abis; map (a: { abi = a; }) [ gnu gnueabi gnueabihf ];
}; };
matchAnyAttrs = patterns: matchAnyAttrs = patterns: