From 0e2c58c77f031d58dcdf8c64928530ad075d085e Mon Sep 17 00:00:00 2001 From: Adam Joseph <54836058+amjoseph-nixpkgs@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:05:55 +0000 Subject: [PATCH] emacs: add withSystemd option --- pkgs/applications/editors/emacs/generic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs/generic.nix b/pkgs/applications/editors/emacs/generic.nix index 91110c48a74b..21d286ff3a2c 100644 --- a/pkgs/applications/editors/emacs/generic.nix +++ b/pkgs/applications/editors/emacs/generic.nix @@ -20,7 +20,6 @@ , AppKit, Carbon, Cocoa, IOKit, OSAKit, Quartz, QuartzCore, WebKit , ImageCaptureCore, GSS, ImageIO # These may be optional -, systemd ? null , withX ? !stdenv.isDarwin && !withPgtk , withNS ? stdenv.isDarwin && !withMacport , withMacport ? macportVersion != null @@ -45,6 +44,7 @@ else if withMotif then "motif" else if withAthena then "athena" else "lucid") +, withSystemd ? stdenv.isLinux, systemd }: assert (libXft != null) -> libpng != null; # probably a bug @@ -141,7 +141,8 @@ let emacs = (if withMacport then llvmPackages_6.stdenv else stdenv).mkDerivation buildInputs = [ ncurses gconf libxml2 gnutls gettext jansson harfbuzz.dev ] - ++ lib.optionals stdenv.isLinux [ dbus libselinux systemd alsa-lib acl gpm ] + ++ lib.optionals stdenv.isLinux [ dbus libselinux alsa-lib acl gpm ] + ++ lib.optionals withSystemd [ systemd ] ++ lib.optionals withX [ xlibsWrapper libXaw Xaw3d libXpm libpng libjpeg giflib libtiff libXft gconf cairo ]