Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: f274fc865628
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 71704e81293c
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Feb 2, 2019

  1. emacs: Link subdirs.el into emacs-packages-deps 

    Emacs loads all the elisp files in the top-level of the site-lisp
directory. However some packages (e.g. mu4e) put their elisp files in a
subdirectory of site-lisp. Emacs will not load these packages unless
subdirs.el is present.

This commit links the subdirs.el file from the emacs package into the
emacs-package-deps package so that packages that put their elisp files
in a subdirectory of site-lisp are loaded.
    @moyamo
    moyamo committed Feb 2, 2019
    Copy the full SHA
    d17d18a View commit details

Commits on Mar 4, 2019

  1. Merge pull request #55081 from moyamo/fix-subdirs.el 

    Link subdirs.el into emacs-packages-deps site-lisp
    @matthewbauer
    matthewbauer authored Mar 4, 2019
    Copy the full SHA
    71704e8 View commit details
Showing with 8 additions and 4 deletions.
  1. +8 −4 pkgs/build-support/emacs/wrapper.nix
12 changes: 8 additions & 4 deletions pkgs/build-support/emacs/wrapper.nix
View file
Original file line number Diff line number Diff line change
@@ -121,21 +121,25 @@ stdenv.mkDerivation {
siteStart="$out/share/emacs/site-lisp/site-start.el"
siteStartByteCompiled="$siteStart"c
subdirs="$out/share/emacs/site-lisp/subdirs.el"
subdirsByteCompiled="$subdirs"c
# A dependency may have brought the original siteStart, delete it and
# create our own
# A dependency may have brought the original siteStart or subdirs, delete
# it and create our own
# 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.
rm -f $siteStart $siteStartByteCompiled
rm -f $siteStart $siteStartByteCompiled $subdirs $subdirsByteCompiled
cat >"$siteStart" <<EOF
(load-file "$emacs/share/emacs/site-lisp/site-start.el")
(add-to-list 'load-path "$out/share/emacs/site-lisp")
(add-to-list 'exec-path "$out/bin")
EOF
# Link subdirs.el from the emacs distribution
ln -s $emacs/share/emacs/site-lisp/subdirs.el -T $subdirs
# Byte-compiling improves start-up time only slightly, but costs nothing.
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart"
$emacs/bin/emacs --batch -f batch-byte-compile "$siteStart" "$subdirs"
'';

phases = [ "installPhase" ];