Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging

2021-04-12 18:49:01 +00:00
parent 82ca81cd62 60daed5714
commit 08b22e605b
377 changed files with 13801 additions and 5789 deletions
@@ -19,8 +19,7 @@ in with pkgs; rec {
  tarMinimal = gnutar.override { acl = null; };

  busyboxMinimal = busybox.override {
-    useMusl = with stdenv.targetPlatform; !isRiscV &&
-                (system == "powerpc64-linux" -> parsed.abi.name != "elfv1");
+    useMusl = !stdenv.targetPlatform.isRiscV;
    enableStatic = true;
    enableMinimal = true;
    extraConfig = ''