From 3ee5cb7266b4c188106d875804e63445b966662b Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Wed, 12 Mar 2025 14:22:40 +0800 Subject: [PATCH] Reapply "emacs: enable __structuredAttrs by default in elisp build helpers" This reverts commit e9dab0cc20091a200b3d73309d7a9758fb284565. The fix[1] has been merged into staging, so we can enable __structuredAttrs again. [1]: https://github.com/NixOS/nixpkgs/pull/388908 --- nixos/doc/manual/release-notes/rl-2505.section.md | 3 +++ pkgs/applications/editors/emacs/build-support/generic.nix | 1 + 2 files changed, 4 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md index 87bf2c1b1cca..50d812515435 100644 --- a/nixos/doc/manual/release-notes/rl-2505.section.md +++ b/nixos/doc/manual/release-notes/rl-2505.section.md @@ -208,6 +208,9 @@ - `pkgs.nextcloud28` has been removed since it's out of support upstream. +- Emacs lisp build helpers, such as `emacs.pkgs.melpaBuild`, now enables `__structuredAttrs` by default. + Environment variables have to be passed via the `env` attribute. + - `buildGoModule` now passes environment variables via the `env` attribute. `CGO_ENABLED` should now be specified with `env.CGO_ENABLED` when passing to buildGoModule. Direct specification of `CGO_ENABLED` is now redirected by a compatibility layer with a warning, but will become an error in future releases. Go-related environment variables previously shadowed by `buildGoModule` now results in errors when specified directly. Such variables include `GOOS` and `GOARCH`. diff --git a/pkgs/applications/editors/emacs/build-support/generic.nix b/pkgs/applications/editors/emacs/build-support/generic.nix index ddab4bc70a00..b4e96f6490fb 100644 --- a/pkgs/applications/editors/emacs/build-support/generic.nix +++ b/pkgs/applications/editors/emacs/build-support/generic.nix @@ -61,6 +61,7 @@ lib.extendMkDerivation { propagatedUserEnvPkgs = finalAttrs.packageRequires ++ propagatedUserEnvPkgs; strictDeps = args.strictDeps or true; + __structuredAttrs = args.__structuredAttrs or true; inherit turnCompilationWarningToError ignoreCompilationError;