From 236fd9c90262fcbdcbedb9ee580a0473c79315c7 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Tue, 24 Aug 2021 18:48:22 +0200 Subject: [PATCH] darwin.signingUtils: move signDarwinBinariesIn from fixupOutputHooks to postFixupHooks to fix ghc build --- .../darwin/signing-utils/auto-sign-hook.sh | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh index 430aba8cdc7e..cca65661f8a9 100644 --- a/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh +++ b/pkgs/os-specific/darwin/signing-utils/auto-sign-hook.sh @@ -1,4 +1,4 @@ -fixupOutputHooks+=('signDarwinBinariesIn $prefix') +postFixupHooks+=(signDarwinBinariesInAllOutputs) # Uses signingUtils, see definition of autoSignDarwinBinariesHook in # darwin-packages.nix @@ -14,7 +14,18 @@ signDarwinBinariesIn() { return 0 fi + echo "signing $dir" + while IFS= read -r -d $'\0' f; do signIfRequired "$f" done < <(find "$dir" -type f -print0) } + +# Apply fixup to each output. +signDarwinBinariesInAllOutputs() { + local output + + for output in $outputs; do + signDarwinBinariesIn "${!output}" + done +}