b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

makeBinaryWrapper: Fix issues on aarch64-darwin/macOS 12 (Monterey)

Browse source 
Sanitizers don't seem to be present on aarch64-darwin/macOS 12 (Monterey), so they are removed from the aarch64-darwin tests.

Switching from nativeBuildInputs to buildInputs and adding cc to the deps list caused some strange error messages to go away.
This commit is contained in:
Tobias Bergkvist 2021-12-16 21:29:21 +01:00
parent d5435990b0
commit ebf46e5764
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/test/make-binary-wrapper/default.nix
View file

@ -1,7 +1,7 @@
{ lib, coreutils, python3, gcc, writeText, writeScript, runCommand, makeBinaryWrapper }: { lib, coreutils, python3, gcc, writeText, writeScript, runCommand, makeBinaryWrapper }:
let let
env = { nativeBuildInputs = [ makeBinaryWrapper ]; }; env = { buildInputs = [ makeBinaryWrapper ]; };
envCheck = runCommand "envcheck" env '' envCheck = runCommand "envcheck" env ''
${gcc}/bin/cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c} ${gcc}/bin/cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c}
''; '';

11
pkgs/top-level/all-packages.nix
View file

@ -697,8 +697,15 @@ with pkgs;
''; '';
in in
makeSetupHook { makeSetupHook {
deps = [ dieHook ]; deps = [ dieHook cc ];
substitutions.passthru.tests = callPackage ../test/make-binary-wrapper { inherit makeBinaryWrapper; }; substitutions.passthru.tests = callPackage ../test/make-binary-wrapper {
makeBinaryWrapper = makeBinaryWrapper.override {
sanitizers = (if stdenv.isDarwin && stdenv.isAarch64
then [ ]
else [ "undefined" "address" ]
);
};
};
} script; } script;
in in
lib.makeOverridable f { lib.makeOverridable f {