pyrox.dev
emacs: update dependencies
new config options, xwidgets support updated in emacs 26
cc @chaoflow @lovek323 @peti @the-kenny @jwiegley
+7
-6
pkgs/applications/editors/emacs/default.nix
+7
-6
pkgs/applications/editors/emacs/default.nix
···
1
1
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
2
2
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
3
3
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
4
-
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
4
+
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
5
+
, systemd ? null
5
6
, withX ? !stdenv.isDarwin
6
7
, withGTK2 ? false, gtk2 ? null
7
8
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
8
-
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
9
+
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
9
10
, withCsrc ? true
10
11
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
11
12
}:
···
16
17
assert withGTK3 -> withX || stdenv.isDarwin;
17
18
assert withGTK2 -> !withGTK3 && gtk2 != null;
18
19
assert withGTK3 -> !withGTK2 && gtk3 != null;
19
-
assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
20
+
assert withXwidgets -> withGTK3 && webkitgtk != null;
20
21
21
22
let
22
23
toolkit =
···
52
53
53
54
buildInputs =
54
55
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
55
-
++ lib.optionals stdenv.isLinux [ dbus libselinux ]
56
+
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
56
57
++ lib.optionals withX
57
58
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
58
-
imagemagick gconf ]
59
+
imagemagick gconf m17n_lib libotf ]
59
60
++ lib.optional (withX && withGTK2) gtk2
60
61
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
61
62
++ lib.optional (stdenv.isDarwin && withX) cairo
62
-
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
63
+
++ lib.optionals (withX && withXwidgets) [ webkitgtk ];
63
64
64
65
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
65
66