Unverified Commit 87ed486d authored by Randy Eckenrode's avatar Randy Eckenrode
Browse files

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

The ld64 in the updated bootstrap tools is capable of code-signing, so
this hook is no longer needed.
parent 83ee31f3
Loading
Loading
Loading
Loading
+0 −17
Original line number Diff line number Diff line
{
  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
  '';
}
+0 −2
Original line number Diff line number Diff line
@@ -647,8 +647,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
          selfDarwin: superDarwin: {
            signingUtils = prevStage.darwin.signingUtils.override { inherit (selfDarwin) sigtool; };

            postLinkSignHook = prevStage.darwin.postLinkSignHook.override { inherit (selfDarwin) sigtool; };

            # Rewrap binutils with the real libSystem
            binutils = superDarwin.binutils.override {
              inherit (self) coreutils;
+3 −0
Original line number Diff line number Diff line
@@ -85,4 +85,7 @@ mapAliases ({
  ### O ###

  opencflite = pkgs.opencflite; # added 2024-05-02

  ### P ###
  postLinkSignHook = throw "'darwin.postLinkSignHook' has been removed because it is obsolete"; # added 2025-02-23
})
+0 −2
Original line number Diff line number Diff line
@@ -192,8 +192,6 @@ makeScopeWithSplicing' {

      signingUtils = callPackage ../os-specific/darwin/signing-utils { };

      postLinkSignHook = callPackage ../os-specific/darwin/signing-utils/post-link-sign-hook.nix { };

      autoSignDarwinBinariesHook = pkgs.makeSetupHook {
        name = "auto-sign-darwin-binaries-hook";
        propagatedBuildInputs = [ self.signingUtils ];