diff options
| author | adisbladis <adisbladis@gmail.com> | 2023-06-20 13:22:21 +1200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-20 13:22:21 +1200 |
| commit | 23bd312777fd2265e0e1c38effe2c32c160b5d3b (patch) | |
| tree | 2d28185e56304f61a7b597997ea7302097dd04d8 | |
| parent | 623d7d2124465e60a3f39f96e0299fa4c3c7b055 (diff) | |
| parent | 5f253d2521e371b7e5cb6ee72ba885ada985118b (diff) | |
Merge pull request #238586 from adisbladis/emacs-passhru-nativecomp-fixup
emacs: add back nativeComp/treeSitter passthru
| -rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 3 | ||||
| -rw-r--r-- | pkgs/build-support/emacs/wrapper.nix | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 30da08920a8fe..3d3b88e14c3db 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -386,6 +386,9 @@ mkDerivation (finalAttrs: (lib.optionalAttrs withNativeCompilation { inherit withTreeSitter; pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage); 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 = { diff --git a/pkgs/build-support/emacs/wrapper.nix b/pkgs/build-support/emacs/wrapper.nix index 4c30a06571220..a3842dec69974 100644 --- a/pkgs/build-support/emacs/wrapper.nix +++ b/pkgs/build-support/emacs/wrapper.nix @@ -36,8 +36,8 @@ in customEmacsPackages.withPackages (epkgs: [ epkgs.evil epkgs.magit ]) self: let inherit (self) emacs; - withNativeCompilation = emacs.withNativeCompilation or false; - withTreeSitter = emacs.withTreeSitter or false; + withNativeCompilation = emacs.withNativeCompilation or emacs.nativeComp or false; + withTreeSitter = emacs.withTreeSitter or emacs.treeSitter or false; in packagesFun: # packages explicitly requested by the user let |