diff options
| author | Lin Jian <me@linj.tech> | 2024-09-27 12:49:05 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-27 12:49:05 +0800 |
| commit | 9e7360eb31a908663b9e035ac3d0c256b0357e42 (patch) | |
| tree | 04adab01d6a0efe39d66d8e369acb6f7547dce25 | |
| parent | [Backport release-24.05] lgogdownloader: 3.12 -> 3.14; cleanup (#344307) (diff) | |
| parent | emacs: do not allow webkitgtk on Emacs >= 30 (diff) | |
| download | nixpkgs-9e7360eb31a908663b9e035ac3d0c256b0357e42.tar.gz | |
[24.05] emacs: do not allow webkitgtk on Emacs >= 30 (#344740)
| -rw-r--r-- | pkgs/applications/editors/emacs/make-emacs.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 59cced7ec49a..988df1b8951b 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 |