alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #238586 from adisbladis/emacs-passhru-nativecomp-fixup

Browse source 
emacs: add back nativeComp/treeSitter passthru
This commit is contained in:
adisbladis 2023-06-20 13:22:21 +12:00 committed by GitHub
parent 623d7d2124 5f253d2521
commit 23bd312777
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/applications/editors/emacs/generic.nix
View file

@ -386,6 +386,9 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation {
inherit withTreeSitter; inherit withTreeSitter;
pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
tests = { inherit (nixosTests) emacs-daemon; }; tests = { inherit (nixosTests) emacs-daemon; };
# Backwards compatibility aliases. Remove this at some point before 23.11 release cut-off.
nativeComp = builtins.trace "emacs.passthru: nativeComp was renamed to withNativeCompilation and will be removed in 23.11" withNativeCompilation;
treeSitter = builtins.trace "emacs.passthru: treeSitter was renamed to withTreeSitter and will be removed in 23.11" withTreeSitter;
}; };
meta = { meta = {

4
pkgs/build-support/emacs/wrapper.nix
View file

@ -36,8 +36,8 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ])
self: self:
let let
inherit (self) emacs; inherit (self) emacs;
withNativeCompilation = emacs.withNativeCompilation or false; withNativeCompilation = emacs.withNativeCompilation or emacs.nativeComp or false;
withTreeSitter = emacs.withTreeSitter or false; withTreeSitter = emacs.withTreeSitter or emacs.treeSitter or false;
in in
packagesFun: # packages explicitly requested by the user packagesFun: # packages explicitly requested by the user
let let