From 565db308762cc1f5fc6df155e0981327b229acec Mon Sep 17 00:00:00 2001 From: Ryan Burns Date: Mon, 16 Aug 2021 18:52:22 -0700 Subject: [PATCH] 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`. --- pkgs/top-level/stage.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/stage.nix b/pkgs/top-level/stage.nix index b2e717fda67c..dc43bbec9d33 100644 --- a/pkgs/top-level/stage.nix +++ b/pkgs/top-level/stage.nix @@ -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; };