Skip to content

Commit 978b82a

Browse files
authored
Merge pull request IntersectMBO#5539 from input-output-hk/angerman/fix-macos-signatures
Add darwin.signingUtils
2 parents 2532482 + 677711d commit 978b82a

File tree

1 file changed

+12
-4
lines changed

1 file changed

+12
-4
lines changed

nix/set-git-rev.nix

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
11
{ pkgs }:
22
drv:
3-
pkgs.buildPackages.runCommand drv.name
3+
with pkgs;
4+
buildPackages.runCommand drv.name
45
{
56
inherit (drv) exeName exePath meta passthru;
6-
} ''
7+
# this is to ensure we are re-signing macOS binaries that might have been
8+
# mutilated by set-git-rev (e.g. patching in the git revision.)
9+
nativeBuildInputs = lib.optionals hostPlatform.isDarwin [ darwin.signingUtils ];
10+
} (''
711
mkdir -p $out
812
cp --no-preserve=timestamps --recursive ${drv}/* $out/
913
chmod -R +w $out/bin
10-
${pkgs.pkgsBuildBuild.haskellBuildUtils}/bin/set-git-rev "${pkgs.gitrev}" $out/bin/*
11-
''
14+
${pkgsBuildBuild.haskellBuildUtils}/bin/set-git-rev "${gitrev}" $out/bin/*
15+
'' + lib.optionalString hostPlatform.isDarwin ''
16+
for exe in $out/bin/*; do
17+
signIfRequired "$exe"
18+
done
19+
'')

0 commit comments

Comments
 (0)