diff options
| author | adisbladis <adisbladis@gmail.com> | 2020-07-23 22:17:58 +0200 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2020-07-24 03:16:17 +0200 |
| commit | 807e8e053cf6778db607fffdf4623ff7a84324dc (patch) | |
| tree | 05cd672e799d13cfafa2fc2db4d3a727c5e8eb51 /pkgs/applications/editors/emacs | |
| parent | e89082346762164f5a9f7f3ebc3afa13fb964718 (diff) | |
emacs: Always add cairo as a build input if X is enabled
Diffstat (limited to 'pkgs/applications/editors/emacs')
| -rw-r--r-- | pkgs/applications/editors/emacs/default.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index b725f583ac0d..bb2b9f4622b2 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -88,12 +88,11 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg libungif libtiff libXft - gconf ] + gconf cairo ] ++ lib.optionals (withX || withNS) [ imagemagick librsvg ] ++ lib.optionals (stdenv.isLinux && withX) [ m17n_lib libotf ] ++ lib.optional (withX && withGTK2) gtk2-x11 ++ lib.optionals (withX && withGTK3) [ gtk3-x11 gsettings-desktop-schemas ] - ++ lib.optional (stdenv.isDarwin && withX) cairo ++ lib.optionals (withX && withXwidgets) [ webkitgtk glib-networking ] ++ lib.optionals withNS [ AppKit GSS ImageIO ] ++ lib.optionals nativeComp [ libgccjit ] |