Skip to content

tests.makeBinaryWrapper: fix cross test on aarch64-linux #255231

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
Artturin merged 1 commit into from
Sep 16, 2023
Merged

tests.makeBinaryWrapper: fix cross test on aarch64-linux #255231

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion pkgs/test/make-binary-wrapper/cross.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
, runCommand
, makeBinaryWrapper
, binutils
, lib
, expectedArch ? stdenv.hostPlatform.parsed.cpu.name
}:


runCommand "make-binary-wrapper-test-cross" {
nativeBuildInputs = [
makeBinaryWrapper
binutils
];
inherit expectedArch;
# For x86_64-linux the machine field is
# Advanced Micro Devices X86-64
# and uses a dash instead of a underscore unlike x86_64-linux in hostPlatform.parsed.cpu.name
expectedArch = lib.replaceStrings ["_"] ["-"] expectedArch;
} ''
touch prog
chmod +x prog
Expand Down