awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-07 12:47:32 -05:00
Code Issues Packages Projects Releases Wiki Activity

Add a patch for restart-emacs

Browse Source 
Before this change, trying to use `doom/restart-and-restore` would
result in a failed to load `default.el` as the wrong binary would be launched.

This fixes that.
This commit is contained in:
Ron B
2021-06-13 15:12:27 +03:00
committed by László Vaskó
parent 4857f7c12a
commit e9a82e6557
3 changed files with 27 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
default.nix
View File

@ -225,6 +225,7 @@ emacs.overrideAttrs (esuper:
wrapEmacs() {
wrapProgram $1 \
--set DOOMDIR ${doomDir} \
--set NIX_DOOM_EMACS_BINARY $1 \
--set __DEBUG_doom_emacs_DIR ${doom-emacs} \
--set __DEBUG_doomLocal_DIR ${doomLocal}
}

4
overrides.nix
View File

@ -71,6 +71,10 @@ self: super: {
pname = "php-extras";
};
restart-emacs = super.restart-emacs.overrideAttrs (esuper: {
patches = [ ./restart-emacs.patch ];
});
revealjs = self.straightBuild {
pname = "revealjs";

22
restart-emacs.patch Normal file
View File

@ -0,0 +1,22 @@
--- a/restart-emacs.el 1970-01-01 02:00:01.000000000 +0200
+++ b/restart-emacs.el 2021-06-13 14:37:50.520954543 +0300
@@ -94,12 +94,13 @@
"Get absolute path to binary of currently running Emacs.
On Windows get path to runemacs.exe if possible."
- (let ((emacs-binary-path (expand-file-name invocation-name invocation-directory))
- (runemacs-binary-path (when (memq system-type '(windows-nt ms-dos))
- (expand-file-name "runemacs.exe" invocation-directory))))
- (if (and runemacs-binary-path (file-exists-p runemacs-binary-path))
- runemacs-binary-path
- emacs-binary-path)))
+ (if (getenv "NIX_DOOM_EMACS_BINARY") (getenv "NIX_DOOM_EMACS_BINARY")
+ (let ((emacs-binary-path (expand-file-name invocation-name invocation-directory))
+ (runemacs-binary-path (when (memq system-type '(windows-nt ms-dos))
+ (expand-file-name "runemacs.exe" invocation-directory))))
+ (if (and runemacs-binary-path (file-exists-p runemacs-binary-path))
+ runemacs-binary-path
+ emacs-binary-path))))
(defun restart-emacs--record-tty-file (current &rest ignored)
"Save the buffer which is being currently selected in the frame.