about summary refs log tree commit diff
path: root/pkgs/applications/editors/emacs
diff options
context:
space:
mode:
authoradisbladis <adisbladis@gmail.com>2022-08-24 08:37:44 +0800
committeradisbladis <adisbladis@gmail.com>2022-08-24 08:45:46 +0800
commitd20c9d7a881e5693f549fb8eecea861fa83e8b32 (patch)
tree4ae50dd9ded0b1d511ae964bb2e8416c5c34c474 /pkgs/applications/editors/emacs
parenteb569cf5cc4ff90eb78896c04ee1fd377acc7e1b (diff)
downloadnixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.tar
nixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.tar.gz
nixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.tar.bz2
nixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.tar.lz
nixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.tar.xz
nixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.tar.zst
nixlib-d20c9d7a881e5693f549fb8eecea861fa83e8b32.zip
emacs: Set recurseIntoAttrs on package set
In the past the motivation to not recurse into Emacs packages was that
it added quite a lot of packages to the evalution and they were so
fast to build locally that substituting them from a binary cache
didn't make sense.

With native compilation this equation has changed drastically, build
times are much longer and build closures are larger so the utility
of having cached packages has gone way up.

Additionally, it looks to me like Emacs is the only ecosystem in nixpkgs to
ever care about evaluation performance like this.
Every other extensible editor ecosystem has recurseIntoAttrs set to true on their respective
package sets.
Diffstat (limited to 'pkgs/applications/editors/emacs')
-rw-r--r--pkgs/applications/editors/emacs/generic.nix4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix
index 1f49c3c23af0..4243ad47a243 100644
--- a/pkgs/applications/editors/emacs/generic.nix
+++ b/pkgs/applications/editors/emacs/generic.nix
@@ -11,7 +11,7 @@
 , libtiff, librsvg, libwebp, gconf, libxml2, imagemagick, gnutls, libselinux
 , alsa-lib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
 , sigtool, jansson, harfbuzz, sqlite, nixosTests
-, dontRecurseIntoAttrs, emacsPackagesFor
+, recurseIntoAttrs, emacsPackagesFor
 , libgccjit, targetPlatform, makeWrapper # native-comp params
 , fetchFromSavannah
 , systemd ? null
@@ -216,7 +216,7 @@ let emacs = stdenv.mkDerivation (lib.optionalAttrs nativeComp {
 
   passthru = {
     inherit nativeComp;
-    pkgs = dontRecurseIntoAttrs (emacsPackagesFor emacs);
+    pkgs = recurseIntoAttrs (emacsPackagesFor emacs);
     tests = { inherit (nixosTests) emacs-daemon; };
   };