diff options
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/test/make-binary-wrapper/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 11 |
2 files changed, 10 insertions, 3 deletions
diff --git a/pkgs/test/make-binary-wrapper/default.nix b/pkgs/test/make-binary-wrapper/default.nix index 7b4d0b26b5cc5..b5bbf994ffa3f 100644 --- a/pkgs/test/make-binary-wrapper/default.nix +++ b/pkgs/test/make-binary-wrapper/default.nix @@ -1,7 +1,7 @@ { lib, coreutils, python3, gcc, writeText, writeScript, runCommand, makeBinaryWrapper }: let - env = { nativeBuildInputs = [ makeBinaryWrapper ]; }; + env = { buildInputs = [ makeBinaryWrapper ]; }; envCheck = runCommand "envcheck" env '' ${gcc}/bin/cc -Wall -Werror -Wpedantic -o $out ${./envcheck.c} ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b9645f975b3b0..3755fd6bcd566 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -697,8 +697,15 @@ with pkgs; ''; in makeSetupHook { - deps = [ dieHook ]; - substitutions.passthru.tests = callPackage ../test/make-binary-wrapper { inherit makeBinaryWrapper; }; + deps = [ dieHook cc ]; + substitutions.passthru.tests = callPackage ../test/make-binary-wrapper { + makeBinaryWrapper = makeBinaryWrapper.override { + sanitizers = (if stdenv.isDarwin && stdenv.isAarch64 + then [ ] + else [ "undefined" "address" ] + ); + }; + }; } script; in lib.makeOverridable f { |