emacsWithPackages: link packages into single load-path
This should provide a small speed improvement by avoiding having to set hundreds of load-paths.
This commit is contained in:
parent
2b1024646b
commit
32c30411cf
|
@ -32,7 +32,7 @@ in customEmacsPackages.emacsWithPackages (epkgs: [ epkgs.evil epkgs.magit ])
|
|||
|
||||
*/
|
||||
|
||||
{ lib, makeWrapper, stdenv }: self:
|
||||
{ lib, lndir, makeWrapper, stdenv }: self:
|
||||
|
||||
with lib; let inherit (self) emacs; in
|
||||
|
||||
|
@ -47,10 +47,13 @@ in
|
|||
|
||||
stdenv.mkDerivation {
|
||||
name = (appendToName "with-packages" emacs).name;
|
||||
nativeBuildInputs = [ emacs makeWrapper ];
|
||||
nativeBuildInputs = [ emacs lndir makeWrapper ];
|
||||
inherit emacs explicitRequires;
|
||||
phases = [ "installPhase" ];
|
||||
installPhase = ''
|
||||
mkdir -p $out/bin
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
|
||||
local requires
|
||||
for pkg in $explicitRequires; do
|
||||
findInputs $pkg requires propagated-user-env-packages
|
||||
|
@ -59,50 +62,47 @@ stdenv.mkDerivation {
|
|||
|
||||
siteStart="$out/share/emacs/site-lisp/site-start.el"
|
||||
|
||||
addEmacsPath() {
|
||||
local list=$1
|
||||
# Begin the new site-start.el by loading the original, which sets some
|
||||
# NixOS-specific paths. Paths are searched in the reverse of the order
|
||||
# they are specified in, so user and system profile paths are searched last.
|
||||
cat >"$siteStart" <<EOF
|
||||
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
|
||||
(add-to-list 'load-path "$out/share/emacs/site-lisp")
|
||||
EOF
|
||||
|
||||
linkPath() {
|
||||
local pkg=$1
|
||||
local path=$2
|
||||
# Add the path to the search path list, but only if it exists
|
||||
if [[ -d "$path" ]]; then
|
||||
echo "(add-to-list '$list \"$path\")" >>"$siteStart"
|
||||
if [[ -d "$pkg/$path" ]]; then
|
||||
lndir -silent "$pkg/$path" "$out/$path"
|
||||
fi
|
||||
}
|
||||
|
||||
# Add a package's paths to site-start.el
|
||||
addEmacsPackage() {
|
||||
addEmacsPath "exec-path" "$1/bin"
|
||||
addEmacsPath "load-path" "$1/share/emacs/site-lisp"
|
||||
linkEmacsPackage() {
|
||||
linkPath "$1" "bin"
|
||||
linkPath "$1" "share/emacs/site-lisp"
|
||||
}
|
||||
|
||||
mkdir -p $out/share/emacs/site-lisp
|
||||
# Begin the new site-start.el by loading the original, which sets some
|
||||
# NixOS-specific paths. Paths are searched in the reverse of the order
|
||||
# they are specified in, so user and system profile paths are searched last.
|
||||
echo "(load-file \"$emacs/share/emacs/site-lisp/site-start.el\")" >"$siteStart"
|
||||
|
||||
# Set paths for the dependencies of the requested packages. These paths are
|
||||
# searched before the profile paths, but after the explicitly-required paths.
|
||||
for pkg in $requires; do
|
||||
# The explicitly-required packages are also in the list, but we will add
|
||||
# those paths last.
|
||||
if ! ( echo "$explicitRequires" | grep "$pkg" >/dev/null ) ; then
|
||||
addEmacsPackage $pkg
|
||||
fi
|
||||
# First, link all the explicitly-required packages.
|
||||
for pkg in $explicitRequires; do
|
||||
linkEmacsPackage $pkg
|
||||
done
|
||||
|
||||
# Finally, add paths for all the explicitly-required packages. These paths
|
||||
# will be searched first.
|
||||
for pkg in $explicitRequires; do
|
||||
addEmacsPackage $pkg
|
||||
# Next, link all the dependencies.
|
||||
for pkg in $requires; do
|
||||
linkEmacsPackage $pkg
|
||||
done
|
||||
|
||||
# Byte-compiling improves start-up time only slightly, but costs nothing.
|
||||
emacs --batch -f batch-byte-compile "$siteStart"
|
||||
|
||||
mkdir -p $out/bin
|
||||
# Wrap emacs and friends so they find our site-start.el before the original.
|
||||
for prog in $emacs/bin/*; do # */
|
||||
makeWrapper "$prog" $out/bin/$(basename "$prog") \
|
||||
local progname=$(basename "$prog")
|
||||
rm -f "$out/bin/$progname"
|
||||
makeWrapper "$prog" "$out/bin/$progname" \
|
||||
--suffix EMACSLOADPATH ":" "$out/share/emacs/site-lisp:"
|
||||
done
|
||||
|
||||
|
|
|
@ -11720,6 +11720,7 @@ let
|
|||
inherit lib newScope stdenv;
|
||||
inherit fetchFromGitHub fetchgit fetchhg fetchurl;
|
||||
inherit emacs texinfo makeWrapper;
|
||||
inherit (xorg) lndir;
|
||||
|
||||
trivialBuild = callPackage ../build-support/emacs/trivial.nix {
|
||||
inherit emacs;
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
, lib, newScope, stdenv, fetchurl, fetchgit, fetchFromGitHub, fetchhg
|
||||
|
||||
, emacs, texinfo, makeWrapper
|
||||
, emacs, texinfo, lndir, makeWrapper
|
||||
, trivialBuild
|
||||
, melpaBuild
|
||||
|
||||
|
@ -60,7 +60,7 @@ let
|
|||
};
|
||||
|
||||
emacsWithPackages = import ../build-support/emacs/wrapper.nix {
|
||||
inherit lib makeWrapper stdenv;
|
||||
inherit lib lndir makeWrapper stdenv;
|
||||
};
|
||||
|
||||
packagesFun = self: with self; {
|
||||
|
|
Loading…
Reference in a new issue