movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-12 04:35:41 +03:00
Code Issues Projects Releases Packages Wiki Activity

darwin.postLinkSignHook: drop and add to darwin-aliases.nix

Browse source 
The ld64 in the updated bootstrap tools is capable of code-signing, so
this hook is no longer needed.
This commit is contained in:
Randy Eckenrode 2025-02-23 02:09:52 -05:00
parent 83ee31f348
commit 87ed486d42
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
4 changed files with 3 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

17
pkgs/os-specific/darwin/signing-utils/post-link-sign-hook.nix
View file

@ -1,17 +0,0 @@
{
writeTextFile,
cctools,
sigtool,
}:
writeTextFile {
name = "post-link-sign-hook";
executable = true;
text = ''
if [ "$linkerOutput" != "/dev/null" ]; then
CODESIGN_ALLOCATE=${cctools}/bin/${cctools.targetPrefix}codesign_allocate \
${sigtool}/bin/codesign -f -s - "$linkerOutput"
fi
'';
}

2
pkgs/stdenv/darwin/default.nix
View file

@ -647,8 +647,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
selfDarwin: superDarwin: { selfDarwin: superDarwin: {
signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; }; signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; };
postLinkSignHook = prevStage.darwin.postLinkSignHook.override { inherit (selfDarwin) sigtool; };
# Rewrap binutils with the real libSystem # Rewrap binutils with the real libSystem
binutils = superDarwin.binutils.override { binutils = superDarwin.binutils.override {
inherit (self) coreutils; inherit (self) coreutils;

3
pkgs/top-level/darwin-aliases.nix
View file

@ -85,4 +85,7 @@ mapAliases ({
### O ### ### O ###
opencflite = pkgs.opencflite; # added 2024-05-02 opencflite = pkgs.opencflite; # added 2024-05-02
### P ###
postLinkSignHook = throw "'darwin.postLinkSignHook' has been removed because it is obsolete"; # added 2025-02-23
}) })

2
pkgs/top-level/darwin-packages.nix
View file

@ -192,8 +192,6 @@ makeScopeWithSplicing' {
signingUtils = callPackage ../os-specific/darwin/signing-utils { }; signingUtils = callPackage ../os-specific/darwin/signing-utils { };
postLinkSignHook = callPackage ../os-specific/darwin/signing-utils/post-link-sign-hook.nix { };
autoSignDarwinBinariesHook = pkgs.makeSetupHook { autoSignDarwinBinariesHook = pkgs.makeSetupHook {
name = "auto-sign-darwin-binaries-hook"; name = "auto-sign-darwin-binaries-hook";
propagatedBuildInputs = [ self.signingUtils ]; propagatedBuildInputs = [ self.signingUtils ];