From 994274e7a5674b622bc4d034ab4f943a187b607f Mon Sep 17 00:00:00 2001 From: archer-65 Date: Sun, 6 Apr 2025 21:01:46 +0200 Subject: [PATCH] emacs: allow specifying meta in sources --- pkgs/applications/editors/emacs/make-emacs.nix | 4 ++-- pkgs/applications/editors/emacs/sources.nix | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index e203a5fd3506..bb64c30fccdc 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -538,10 +538,10 @@ mkDerivation (finalAttrs: { }; }; - meta = meta // { + meta = { broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ]; - }; + } // meta; }) diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 23ce17d40b89..6b5816604345 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -13,6 +13,7 @@ let patches ? _: [ ], rev, hash, + meta ? { }, }: { inherit @@ -97,7 +98,7 @@ let } .${variant}; mainProgram = "emacs"; - }; + } // meta; }; in {