From e5442ee185efc09f283feeb4c3aaffa284263a5c Mon Sep 17 00:00:00 2001 From: deliciouslytyped <47436522+deliciouslytyped@users.noreply.github.com> Date: Sun, 3 Mar 2019 18:02:35 +0100 Subject: emacs26: adds parameter siteStart: don't hard-code ./site-start.el --- pkgs/applications/editors/emacs/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/applications') diff --git a/pkgs/applications/editors/emacs/default.nix b/pkgs/applications/editors/emacs/default.nix index 6f56ba6cf492..2f7a4233656c 100644 --- a/pkgs/applications/editors/emacs/default.nix +++ b/pkgs/applications/editors/emacs/default.nix @@ -10,6 +10,7 @@ , withXwidgets ? false, webkitgtk ? null, wrapGAppsHook ? null, glib-networking ? null , withCsrc ? true , srcRepo ? false, autoconf ? null, automake ? null, texinfo ? null +, siteStart ? ./site-start.el }: assert (libXft != null) -> libpng != null; # probably a bug @@ -100,7 +101,7 @@ stdenv.mkDerivation rec { postInstall = '' mkdir -p $out/share/emacs/site-lisp - cp ${./site-start.el} $out/share/emacs/site-lisp/site-start.el + cp ${siteStart} $out/share/emacs/site-lisp/site-start.el $out/bin/emacs --batch -f batch-byte-compile $out/share/emacs/site-lisp/site-start.el rm -rf $out/var -- cgit 1.4.1