From 52bd64efbf97ad3649fcf46ec654096a097e0bf7 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 16 Apr 2025 04:53:21 +0800 Subject: [PATCH] Revert "emacs: disable __structuredAttrs for elisp packages for now" This reverts commit 0e1c769aa536813ec186c91c28f433a2956928dc. The proper fix #392928 is on master now so this temp workaround is not needed any more. --- pkgs/applications/editors/emacs/build-support/generic.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index 167f0fcb86b4..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,8 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; - # TODO re-enable after #392928 reaches master - # __structuredAttrs = args.__structuredAttrs or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError;