From 70dfde41fe654593353e7d1f82af05a63fea890f Mon Sep 17 00:00:00 2001 From: Brian Leung Date: Thu, 26 Sep 2024 04:48:03 -0700 Subject: [PATCH] emacs: do not allow webkitgtk on Emacs >= 30 An incompatibility with newer versions of webkit2gtk was revealed upstream (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html). (cherry picked from commit a755ead8efa1716cf72cdbe552835270281d65a6) --- pkgs/applications/editors/emacs/make-emacs.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 59cced7ec49a53f..988df1b8951b969 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -88,7 +88,7 @@ , withWebP ? lib.versionAtLeast version "29" , withX ? !(stdenv.isDarwin || noGui || withPgtk) , withXinput2 ? withX && lib.versionAtLeast version "29" -, withXwidgets ? !stdenv.isDarwin && !noGui && (withGTK3 || withPgtk) +, withXwidgets ? !stdenv.hostPlatform.isDarwin && !noGui && (withGTK3 || withPgtk) && (lib.versionOlder version "30") # XXX: upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html) , withSmallJaDic ? false , withCompressInstall ? true