mirrors/emacs-overlay
1
Fork 0
mirror of https://github.com/nix-community/emacs-overlay.git synced 2025-12-15 15:21:01 -08:00
Code Issues Projects Releases Wiki Activity

Fix incomplete rebase

Browse source
This commit is contained in:
Brian Leung 2024-09-26 21:50:35 -07:00
parent a4ee09a79b
commit 971818ced1
No known key found for this signature in database
GPG key ID: 2D86D6A94C8BB3B1
1 changed files with 26 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

28
overlays/emacs.nix
View file

@ -115,9 +115,33 @@ let
};
});
emacs-unstable = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { };
emacs-unstable = let base = (mkGitEmacs "emacs-unstable" ../repos/emacs/emacs-unstable.json) { };
emacs = emacs-unstable;
in
base.overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
];
passthru = oa.passthru // {
pkgs = oa.passthru.pkgs.overrideScope (eself: esuper: { inherit emacs; });
};
});
emacs-unstable-pgtk = (mkGitEmacs "emacs-unstable-pgtk" ../repos/emacs/emacs-unstable.json) { withPgtk = true; };
emacs-unstable-pgtk = let base = (mkGitEmacs "emacs-unstable-pgtk" ../repos/emacs/emacs-unstable.json) { withPgtk = true; };
emacs = emacs-unstable-pgtk;
in
base.overrideAttrs (
oa: {
patches = oa.patches ++ [
# XXX: #318
./bytecomp-revert.patch
];
passthru = oa.passthru // {
pkgs = oa.passthru.pkgs.overrideScope (eself: esuper: { inherit emacs; });
};
});
emacs-lsp = (mkGitEmacs "emacs-lsp" ../repos/emacs/emacs-lsp.json) { withTreeSitter = false; };