mirror of
https://github.com/nix-community/emacs-overlay.git
synced 2025-12-15 15:21:01 -08:00
Fix 20.03 git/unstable emacs
This commit is contained in:
parent
d6d538153e
commit
4538df67b3
1 changed files with 10 additions and 0 deletions
10
default.nix
10
default.nix
|
|
@ -22,6 +22,10 @@ let
|
|||
mkGitEmacs = namePrefix: jsonFile:
|
||||
(self.emacs.override { srcRepo = true; }).overrideAttrs(old: (let
|
||||
repoMeta = super.lib.importJSON jsonFile;
|
||||
|
||||
# The nativeComp passthru attribute is used a heuristic to check if we're on 20.03 or older
|
||||
isStable = super.lib.hasAttr "nativeComp" (old.passthru or {});
|
||||
|
||||
attrs = {
|
||||
name = "${namePrefix}-${repoMeta.version}";
|
||||
inherit (repoMeta) version;
|
||||
|
|
@ -30,6 +34,7 @@ let
|
|||
repo = "emacs";
|
||||
inherit (repoMeta) sha256 rev;
|
||||
};
|
||||
|
||||
patches = [
|
||||
./patches/tramp-detect-wrapped-gvfsd.patch
|
||||
./patches/clean-env.patch
|
||||
|
|
@ -39,6 +44,11 @@ let
|
|||
--replace '(emacs-repository-get-version)' '"${repoMeta.rev}"' \
|
||||
--replace '(emacs-repository-get-branch)' '"master"'
|
||||
'';
|
||||
} // super.lib.optionalAttrs isStable {
|
||||
buildInputs = old.buildInputs ++ [
|
||||
super.harfbuzz.dev
|
||||
super.jansson
|
||||
];
|
||||
};
|
||||
in attrs));
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue