diff options
| author | Linus Heckemann <git@sphalerite.org> | 2022-08-19 12:04:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-19 12:04:51 +0200 |
| commit | d167d23b40a7e3439d8458dff20e18beb22ed3d9 (patch) | |
| tree | 90dd1b143e92835309028aeff94181b991b93c30 /pkgs/top-level | |
| parent | f758006e8bec189eaa0ad9aa6537ad2a3cf6bfa6 (diff) | |
| parent | 51bd7cf0d05f996c74b8fabebc755a2fe253b50e (diff) | |
Merge pull request #176780 from linj-fork/emacs-native-comp
emacs: enable native-comp
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/aliases.nix | 2 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index ca228b77f4939..020b7c9ac2a16 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -380,8 +380,10 @@ mapAliases ({ electrum-dash = throw "electrum-dash has been removed from nixpkgs as the project is abandoned"; # Added 2022-01-01 # Emacs + emacs28NativeComp = emacs28; # Added 2022-06-08 emacs28Packages = emacs28.pkgs; # Added 2021-10-04 emacs28WithPackages = emacs28.pkgs.withPackages; # Added 2021-10-04 + emacsNativeComp = emacs28NativeComp; # Added 2022-06-08 emacsPackages = emacs.pkgs; # Added 2020-12-18 emacsPackagesGen = throw "'emacsPackagesGen' has been renamed to/replaced by 'emacsPackagesFor'"; # Converted to throw 2022-02-22 emacsPackagesNg = emacs.pkgs; # Added 2019-08-07 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cd11b82c1b9f3..660444d1ac85b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26876,7 +26876,6 @@ with pkgs; em = callPackage ../applications/editors/em { }; emacs = emacs28; - emacsNativeComp = emacs28NativeComp; emacs-nox = emacs28-nox; emacs28 = callPackage ../applications/editors/emacs/28.nix { @@ -26891,10 +26890,6 @@ with pkgs; inherit (darwin) sigtool; }; - emacs28NativeComp = emacs28.override { - nativeComp = true; - }; - emacs28-nox = lowPrio (emacs28.override { withX = false; withNS = false; |