Closed bandithedoge closed 3 months ago
This commit replaces
--replace
with--replace-warn
which is not backported to the stable release (NixOS 23.11).
My mistake, I should've confirmed with the stable branch before pushing.
@bandithedoge could you please provide the most recent revision where commercial-emacs
worked for you?
The error observed here occurs because lisp/loadup.el
does not exist in commercial-emacs
. But upon wrapping that only conditionally with
diff --git a/overlays/emacs.nix b/overlays/emacs.nix
index afe0cc8f..da54f4f1 100644
--- a/overlays/emacs.nix
+++ b/overlays/emacs.nix
@@ -33,9 +33,11 @@ let
[ "--enable-check-lisp-object-type" ];
postPatch = old.postPatch + ''
- substituteInPlace lisp/loadup.el \
- --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
- --replace '(emacs-repository-get-branch)' '"master"'
+ if [ -f "lisp/loadup.el" ]; then
+ substituteInPlace lisp/loadup.el \
+ --replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
+ --replace '(emacs-repository-get-branch)' '"master"'
+ fi
'' +
# XXX: Maybe remove when emacsLsp updates to use Emacs
# 29. We already have logic in upstream Nixpkgs to use
--
2.43.0
commercial-emacs
still does not build with this patch, and instead segfaults. If provided a revision where this is known to build, I can try to bisect and look into this a bit more.
Build failures for git packages are to be expected. Patches welcome.
"x86_64-linux"
Linux 6.7.5-cachyos, NixOS, 24.05 (Uakari), 24.05.20240218.045b51a
yes
yes
nix-env (Nix) 2.18.1
""
"nixos, nixpkgs"
/nix/var/nix/profiles/per-user/root/channels/nixos