From 81da9f2934247b8b924d96f1b38b74affb78d796 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Sun, 18 May 2025 20:29:39 -0300 Subject: [PATCH] emacs: remove native-comp-compiler-options-28.patch Since we do not deal with older Emacsen. P.S.: We can't delete native-comp-compiler-options.patch yet, because Emacs Macport is stuck in Emacs 29. --- pkgs/applications/editors/emacs/make-emacs.nix | 4 +--- .../emacs/native-comp-driver-options-28.patch | 16 ---------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 pkgs/applications/editors/emacs/native-comp-driver-options-28.patch diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 841ab42f23f3..1a1211d6bf84 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -172,9 +172,7 @@ mkDerivation (finalAttrs: { ++ lib.optionals withNativeCompilation [ (replaceVars ( - if lib.versionOlder finalAttrs.version "29" then - ./native-comp-driver-options-28.patch - else if lib.versionOlder finalAttrs.version "30" then + if lib.versionOlder finalAttrs.version "30" then ./native-comp-driver-options.patch else ./native-comp-driver-options-30.patch diff --git a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch b/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch deleted file mode 100644 index 98c6da305145..000000000000 --- a/pkgs/applications/editors/emacs/native-comp-driver-options-28.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el -index a5ab12ae38..e33e71cb55 100644 ---- a/lisp/emacs-lisp/comp.el -+++ b/lisp/emacs-lisp/comp.el -@@ -178,7 +178,7 @@ native-comp-compiler-options - :type '(repeat string) - :version "28.1") - --(defcustom native-comp-driver-options nil -+(defcustom native-comp-driver-options '(@backendPath@) - "Options passed verbatim to the native compiler's back-end driver. - Note that not all options are meaningful; typically only the options - affecting the assembler and linker are likely to be useful. --- -2.37.3 -