Skip to content

pkgsMusl.stdenv: fix build on aarch64 #169764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alyssais merged 3 commits into from
Apr 22, 2022
Merged

pkgsMusl.stdenv: fix build on aarch64 #169764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ec2bca
patchelf_0_13: init at 0.13.1
alyssais Apr 22, 2022
fd5abf0
patchelf: use 0.13.x on aarch64+musl
alyssais Apr 22, 2022
a30237c
pkgsMusl.coreutils: fix build on aarch64
alyssais Apr 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions pkgs/development/tools/misc/patchelf/0.13.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{ stdenv, fetchurl, patchelf }:

# Note: this package is used for bootstrapping fetchurl, and thus
# cannot use fetchpatch! All mutable patches (generated by GitHub or
# cgit) that are needed here should be included directly in Nixpkgs as
# files.

stdenv.mkDerivation rec {
pname = "patchelf";
version = "0.13.1";

src = fetchurl {
url = "https://github.com/NixOS/${pname}/releases/download/${version}/${pname}-${version}.tar.bz2";
sha256 = "sha256-OeiuzNdJXVTfCU0rSnwIAQ/3d3A2+q8k8o4Hd30VmOI=";
};

setupHook = [ ./setup-hook.sh ];

# fails 8 out of 24 tests, problems when loading libc.so.6
doCheck = stdenv.name == "stdenv-linux";

inherit (patchelf) meta;
}
2 changes: 2 additions & 0 deletions pkgs/tools/misc/coreutils/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,8 +113,10 @@ stdenv.mkDerivation (rec {
# Darwin (http://article.gmane.org/gmane.comp.gnu.core-utils.bugs/19351),
# and {Open,Free}BSD.
# With non-standard storeDir: https://github.com/NixOS/nix/issues/512
# On aarch64+musl, test-init.sh fails due to a segfault in diff.
doCheck = stdenv.hostPlatform == stdenv.buildPlatform
&& (stdenv.hostPlatform.libc == "glibc" || stdenv.hostPlatform.isMusl)
&& !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64)
&& !stdenv.isAarch32;

# Prevents attempts of running 'help2man' on cross-built binaries.
Expand Down
9 changes: 8 additions & 1 deletion pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15799,8 +15799,15 @@ with pkgs;

parse-cli-bin = callPackage ../development/tools/parse-cli-bin { };

patchelf = callPackage ../development/tools/misc/patchelf { };
patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then
patchelf_0_13
else
patchelf_0_14;
patchelf_0_9 = callPackage ../development/tools/misc/patchelf/0.9.nix { };
patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix {
patchelf = patchelf_0_14;
};
patchelf_0_14 = callPackage ../development/tools/misc/patchelf { };

patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { });

Expand Down