diff options
author | adisbladis <adisbladis@gmail.com> | 2020-12-18 04:24:41 +0100 |
---|---|---|
committer | adisbladis <adisbladis@gmail.com> | 2021-01-13 17:04:55 +0100 |
commit | 6347f78fd90364bc7dc3d998300b5921ed2b34ee (patch) | |
tree | f214ed01792a81c80e8df2873f727d31a642a1d2 /pkgs/applications | |
parent | 9e2880e5fa0cda607ad670cde12dc93735d2f97a (diff) | |
download | nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.tar nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.tar.gz nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.tar.bz2 nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.tar.lz nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.tar.xz nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.tar.zst nixpkgs-6347f78fd90364bc7dc3d998300b5921ed2b34ee.zip |
emacsPackages*: Move to emacs*.pkgs
This makes it much easier to create customisations around emacs via the a new convenience passthru attr: - `emacs.pkgs`: What used to be emacsPackages is now `emacs.pkgs` The previous versioned names `emacs*Packages` have been moved to aliases.nix and are now considered deprecated in favour of `emacs*.pkgs`.
Diffstat (limited to 'pkgs/applications')
-rw-r--r-- | pkgs/applications/editors/emacs/generic.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 0f3ececd37d..eef98943c3b 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -11,6 +11,7 @@ , libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux , alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf , jansson, harfbuzz +, dontRecurseIntoAttrs ,emacsPackagesFor , libgccjit, targetPlatform, makeWrapper # native-comp params , systemd ? null , withX ? !stdenv.isDarwin @@ -40,9 +41,7 @@ assert withGTK3 -> !withGTK2 && gtk3-x11 != null; assert withXwidgets -> withGTK3 && webkitgtk != null; -let - -in stdenv.mkDerivation (lib.optionalAttrs nativeComp { +let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp { NATIVE_FULL_AOT = "1"; LIBRARY_PATH = "${lib.getLib stdenv.cc.libc}/lib"; } // lib.optionalAttrs stdenv.isDarwin { @@ -175,6 +174,7 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { passthru = { inherit nativeComp; + pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs); }; meta = with lib; { @@ -201,4 +201,5 @@ in stdenv.mkDerivation (lib.optionalAttrs nativeComp { separately. ''; }; -}) +}); +in emacs |