Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

Correctly find codesign binary #6

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions emacs-overlay.nix
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,24 @@ let
}))
];

emacsOsx = mkGitEmacs "emacs-osx" ./emacs-source/emacs-master.json [ ] { };
emacsOsx = mkGitEmacs "emacs-osx" ./emacs-source/emacs-master.json [
./patches/codesign.patch
] { };

emacsOsxNative = mkGitEmacs "emacs-osx" ./emacs-source/emacs-master.json [ ] {
emacsOsxNative = mkGitEmacs "emacs-osx" ./emacs-source/emacs-master.json [
./patches/codesign.patch
] {
nativeComp = true;
};

emacsOsxTile = mkGitEmacs "emacs-osx" ./emacs-source/emacs-master.json [
./patches/codesign.patch
./patches/no-titlebar.patch
./patches/fix-window-role-yabai.patch
] { };

emacsOsxNativeTile = mkGitEmacs "emacs-osx" ./emacs-source/emacs-master.json [
./patches/codesign.patch
./patches/no-titlebar.patch
./patches/fix-window-role-yabai.patch
] { nativeComp = true; };
Expand Down
19 changes: 19 additions & 0 deletions patches/codesign.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -698,7 +698,7 @@
ifeq ($(HAVE_PDUMPER),yes)
$(AM_V_at)$(MAKE_PDUMPER_FINGERPRINT) [email protected]
ifeq ($(DO_CODESIGN),yes)
- codesign -s - -f [email protected]
+ /usr/bin/codesign -s - -f [email protected]
endif
endif
$(AM_V_at)mv [email protected] $@
@@ -901,7 +901,7 @@
@: In the pdumper case, make compile-first after the dump
cp -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT)
ifeq ($(DO_CODESIGN),yes)
- codesign -s - -f bootstrap-emacs$(EXEEXT)
+ /usr/bin/codesign -s - -f bootstrap-emacs$(EXEEXT)
endif
endif