From 1cc6f08cdd8ebb37e33473e81893b4f480eabe16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Sun, 22 May 2022 21:46:06 +0200 Subject: [PATCH] makeBinaryWrapper: fix codesign on aarch64-darwin Reverts 8b79ef2c on aarch64-darwin, no-op on other platforms. --- pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix index fd0fa3ea009..34bed3bb297 100644 --- a/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix +++ b/pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix @@ -1,6 +1,5 @@ { stdenv , lib -, darwin , makeSetupHook , dieHook , writeShellScript @@ -12,7 +11,7 @@ makeSetupHook { deps = [ dieHook ] # https://github.com/NixOS/nixpkgs/issues/148189 - ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) darwin.cctools; + ++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc; substitutions = { cc = "${cc}/bin/cc ${lib.escapeShellArgs (map (s: "-fsanitize=${s}") sanitizers)}";