pyrox.dev
emacs: enable xwidgets support on Darwin (#434941)
authored by TANIGUCHI Masaya and committed by GitHub 993a4bbf 7ba47133
+8
-6
pkgs/applications/editors/emacs/make-emacs.nix
+8
-6
pkgs/applications/editors/emacs/make-emacs.nix
···
95
withX ? !(stdenv.hostPlatform.isDarwin || noGui || withPgtk),
96
withXinput2 ? withX,
97
withXwidgets ?
98
-
!stdenv.hostPlatform.isDarwin
99
-
&& !noGui
100
-
&& (withGTK3 || withPgtk)
101
-
&& (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)
102
withSmallJaDic ? false,
103
withCompressInstall ? true,
104
···
128
assert withImageMagick -> (withX || withNS);
129
assert withNS -> stdenv.hostPlatform.isDarwin && !(withX || variant == "macport");
130
assert withPgtk -> withGTK3 && !withX;
131
-
assert withXwidgets -> !noGui && (withGTK3 || withPgtk);
132
133
let
134
libGccJitLibraryPaths = [
···
348
++ lib.optionals withXinput2 [
349
libXi
350
]
351
-
++ lib.optionals withXwidgets [
352
webkitgtk_4_0
353
]
354
++ lib.optionals stdenv.hostPlatform.isDarwin [
···
95
withX ? !(stdenv.hostPlatform.isDarwin || noGui || withPgtk),
96
withXinput2 ? withX,
97
withXwidgets ?
98
+
!noGui
99
+
&& (withGTK3 || withPgtk || withNS || variant == "macport")
100
+
&& (stdenv.hostPlatform.isDarwin || lib.versionOlder version "30"),
101
+
# XXX: - upstream bug 66068 precludes newer versions of webkit2gtk (https://lists.gnu.org/archive/html/bug-gnu-emacs/2024-09/msg00695.html)
102
+
# XXX: - Apple_SDK WebKit is compatible with Emacs.
103
withSmallJaDic ? false,
104
withCompressInstall ? true,
105
···
129
assert withImageMagick -> (withX || withNS);
130
assert withNS -> stdenv.hostPlatform.isDarwin && !(withX || variant == "macport");
131
assert withPgtk -> withGTK3 && !withX;
132
+
assert withXwidgets -> !noGui && (withGTK3 || withPgtk || withNS || variant == "macport");
133
+
# XXX: The upstream --with-xwidgets flag is enabled only when Emacs is built with GTK3 or with Cocoa (including the withNS and macport variant).
134
135
let
136
libGccJitLibraryPaths = [
···
350
++ lib.optionals withXinput2 [
351
libXi
352
]
353
+
++ lib.optionals (withXwidgets && stdenv.hostPlatform.isLinux) [
354
webkitgtk_4_0
355
]
356
++ lib.optionals stdenv.hostPlatform.isDarwin [