diff options
| author | Luke Granger-Brown <git@lukegb.com> | 2021-04-12 18:26:33 +0000 |
|---|---|---|
| committer | Luke Granger-Brown <git@lukegb.com> | 2021-04-12 18:49:01 +0000 |
| commit | 08b22e605bc7d7560ef6ce567caa43f57178715f (patch) | |
| tree | eed46af25264ec81b18ba7a216beec55a84f6683 /pkgs/stdenv | |
| parent | 82ca81cd62c785b81bf530837c05babcb9cde8a5 (diff) | |
| parent | 60daed57149403acbb622e48a003422eacea4c16 (diff) | |
| download | nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.gz nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.bz2 nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.lz nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.xz nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.tar.zst nixpkgs-08b22e605bc7d7560ef6ce567caa43f57178715f.zip | |
Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 869405a2760..e4db92b7717 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -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 = '' |