diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index bace8a010ee1..cc082bf5a22d 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -60,7 +60,7 @@ systemdLibs, tree-sitter, texinfo, - webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, zlib, @@ -141,6 +141,8 @@ let ++ lib.optionals (stdenv.cc ? cc.lib.libgcc) [ "${lib.getLib stdenv.cc.cc.lib.libgcc}/lib" ]; + + withWebkitgtk = withXwidgets && stdenv.hostPlatform.isLinux; in stdenv.mkDerivation (finalAttrs: { pname = @@ -351,8 +353,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withXinput2 [ libXi ] - ++ lib.optionals (withXwidgets && stdenv.hostPlatform.isLinux) [ - webkitgtk_4_0 + ++ lib.optionals withWebkitgtk [ + webkitgtk_4_1 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool @@ -504,7 +506,8 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - broken = withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); + broken = + (withNativeCompilation && !(stdenv.buildPlatform.canExecute stdenv.hostPlatform)) || withWebkitgtk; knownVulnerabilities = lib.optionals (lib.versionOlder version "30") [ "CVE-2024-53920 CVE-2025-1244, please use newer versions such as emacs30" ];