From 37c86ba2f7726d7bdaae06478f15e6f26feac74e Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 8 Jun 2026 10:07:00 +0800
Subject: [PATCH 1/2] emacs: remove dependency gettext

It is not needed.
---
 pkgs/applications/editors/emacs/make-emacs.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 22246f9fe962..47da6df04c9e 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -249,7 +249,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
 
   buildInputs = [
-    gettext
     gnutls
     (lib.getDev harfbuzz)
   ]

From 0a8b91bf6acf966191f80d1ea339a8fbfd6894ff Mon Sep 17 00:00:00 2001
From: Lin Jian <me@linj.tech>
Date: Mon, 8 Jun 2026 09:56:34 +0800
Subject: [PATCH 2/2] emacs: enable strictDeps

This also fixes build of Emacs 30 withNS on darwin because now Emacs
checks the correct compiler (clang instead of gcc) for Objective-C.
See https://github.com/NixOS/nixpkgs/pull/529324 for more info.
---
 pkgs/applications/editors/emacs/make-emacs.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index 47da6df04c9e..cf0bdf44e488 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -238,6 +238,8 @@ stdenv.mkDerivation (finalAttrs: {
     ""
   ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     makeWrapper
     pkg-config
@@ -246,7 +248,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals srcRepo [
     autoreconfHook
   ]
-  ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ];
+  ++ lib.optionals (withPgtk || withX && (withGTK3 || withXwidgets)) [ wrapGAppsHook3 ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ];
 
   buildInputs = [
     gnutls
@@ -338,9 +341,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withWebkitgtk [
     webkitgtk_4_1
   ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    sigtool
-  ]
   ++ lib.optionals withNS [
     librsvg
   ]