From d20c9d7a881e5693f549fb8eecea861fa83e8b32 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Wed, 24 Aug 2022 08:37:44 +0800 Subject: [PATCH] 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. --- pkgs/applications/editors/emacs/generic.nix | 4 ++-- 1 file 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; }; };