pkgsStatic: fix musleabi* adapter
Fixes pkgsCross.muslpi.nix (depends on pkgsCross.muslpi.busybox-sandbox-shell, which depends on pkgsCross.muslpi.pkgsStatic.stdenv) Currently, the ABI adapter in pkgsStatic does not recognize musleabi/musleabihf and falls back to "musl". ``` > nix eval -f . pkgsCross.muslpi.stdenv.hostPlatform.config "armv6l-unknown-linux-musleabihf" > nix eval -f . pkgsCross.muslpi.pkgsStatic.stdenv.hostPlatform.config "armv6l-unknown-linux-musl" ``` This results in an invalid config passed to GCC configuration, which fails with `Configuration armv6l-unknown-linux-musl not supported`.
This commit is contained in:
parent
739f0b22b7
commit
565db30876
|
@ -239,6 +239,8 @@ let
|
|||
gnu = lib.systems.parse.abis.musl;
|
||||
gnueabi = lib.systems.parse.abis.musleabi;
|
||||
gnueabihf = lib.systems.parse.abis.musleabihf;
|
||||
musleabi = lib.systems.parse.abis.musleabi;
|
||||
musleabihf = lib.systems.parse.abis.musleabihf;
|
||||
}.${stdenv.hostPlatform.parsed.abi.name}
|
||||
or lib.systems.parse.abis.musl;
|
||||
};
|
||||
|
|
Loading…
Reference in a new issue