emacs: update dependencies
new config options, xwidgets support updated in emacs 26 cc @chaoflow @lovek323 @peti @the-kenny @jwiegley
This commit is contained in:
parent
efd4e66854
commit
ea5bcb78c2
|
@ -1,11 +1,12 @@
|
||||||
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
|
{ stdenv, lib, fetchurl, ncurses, xlibsWrapper, libXaw, libXpm, Xaw3d
|
||||||
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
, pkgconfig, gettext, libXft, dbus, libpng, libjpeg, libungif
|
||||||
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
, libtiff, librsvg, gconf, libxml2, imagemagick, gnutls, libselinux
|
||||||
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO
|
, alsaLib, cairo, acl, gpm, AppKit, GSS, ImageIO, m17n_lib, libotf
|
||||||
|
, systemd ? null
|
||||||
, withX ? !stdenv.isDarwin
|
, withX ? !stdenv.isDarwin
|
||||||
, withGTK2 ? false, gtk2 ? null
|
, withGTK2 ? false, gtk2 ? null
|
||||||
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
|
, withGTK3 ? true, gtk3 ? null, gsettings-desktop-schemas ? null
|
||||||
, withXwidgets ? false, webkitgtk24x-gtk3 ? null, wrapGAppsHook ? null, glib-networking ? null
|
, withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null
|
||||||
, withCsrc ? true
|
, withCsrc ? true
|
||||||
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
|
, srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null
|
||||||
}:
|
}:
|
||||||
|
@ -16,7 +17,7 @@ assert withGTK2 -> withX || stdenv.isDarwin;
|
||||||
assert withGTK3 -> withX || stdenv.isDarwin;
|
assert withGTK3 -> withX || stdenv.isDarwin;
|
||||||
assert withGTK2 -> !withGTK3 && gtk2 != null;
|
assert withGTK2 -> !withGTK3 && gtk2 != null;
|
||||||
assert withGTK3 -> !withGTK2 && gtk3 != null;
|
assert withGTK3 -> !withGTK2 && gtk3 != null;
|
||||||
assert withXwidgets -> withGTK3 && webkitgtk24x-gtk3 != null;
|
assert withXwidgets -> withGTK3 && webkitgtk != null;
|
||||||
|
|
||||||
let
|
let
|
||||||
toolkit =
|
toolkit =
|
||||||
|
@ -52,14 +53,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs =
|
buildInputs =
|
||||||
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
|
[ ncurses gconf libxml2 gnutls alsaLib acl gpm gettext ]
|
||||||
++ lib.optionals stdenv.isLinux [ dbus libselinux ]
|
++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ]
|
||||||
++ lib.optionals withX
|
++ lib.optionals withX
|
||||||
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
|
[ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff librsvg libXft
|
||||||
imagemagick gconf ]
|
imagemagick gconf m17n_lib libotf ]
|
||||||
++ lib.optional (withX && withGTK2) gtk2
|
++ lib.optional (withX && withGTK2) gtk2
|
||||||
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
|
++ lib.optionals (withX && withGTK3) [ gtk3 gsettings-desktop-schemas ]
|
||||||
++ lib.optional (stdenv.isDarwin && withX) cairo
|
++ lib.optional (stdenv.isDarwin && withX) cairo
|
||||||
++ lib.optionals (withX && withXwidgets) [ webkitgtk24x-gtk3 glib-networking ];
|
++ lib.optionals (withX && withXwidgets) [ webkitgtk ];
|
||||||
|
|
||||||
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
|
propagatedBuildInputs = lib.optionals stdenv.isDarwin [ AppKit GSS ImageIO ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue