Merge #174038: makeBinaryWrapper: fix codesign on aarch64-darwin

...into staging-next
main
Vladimír Čunát 2 years ago
commit 063c5603cf
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
  1. 3
      pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix

@ -1,6 +1,5 @@
{ stdenv { stdenv
, lib , lib
, darwin
, makeSetupHook , makeSetupHook
, dieHook , dieHook
, writeShellScript , writeShellScript
@ -12,7 +11,7 @@
makeSetupHook { makeSetupHook {
deps = [ dieHook ] deps = [ dieHook ]
# https://github.com/NixOS/nixpkgs/issues/148189 # https://github.com/NixOS/nixpkgs/issues/148189
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwin.cctools; ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc;
substitutions = { substitutions = {
cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}"; cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";

Loading…
Cancel
Save