diff options
| author | Ryan Burns <rtburns@protonmail.com> | 2021-03-15 19:23:35 -0700 |
|---|---|---|
| committer | Ryan Burns <rtburns@protonmail.com> | 2021-03-15 19:27:41 -0700 |
| commit | 68823d6d65b17eb900307588a723ed5acdcf98f9 (patch) | |
| tree | d8ea8e42b7fe27760ce22f69882510bfbbed8dae /pkgs/stdenv/linux/make-bootstrap-tools.nix | |
| parent | 7b9c1dbd28218c68e923f5226705f2cb10b44390 (diff) | |
| download | nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.tar nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.tar.gz nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.tar.bz2 nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.tar.lz nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.tar.xz nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.tar.zst nixpkgs-68823d6d65b17eb900307588a723ed5acdcf98f9.zip | |
stdenv/bootstrap-tools: remove powerpc64 special case
Now that powerpc64 is always ELFv2, we can unconditionally use musl tools here.
Diffstat (limited to 'pkgs/stdenv/linux/make-bootstrap-tools.nix')
| -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 = '' |