logistic-bot/nix-doom-emacs-unstraightened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Explicitly create autoloads file for trivialBuild

Browse source 
nixpkgs noticed the autoloads file they were writing is not normally
loaded (see commit 84c2e0096d0c365e3f2a81ad8533c5b8910e7a73 there).

We load (include in our Doom profile) these explicitly (see commit
fa6fe4cf93). So reinstate autoload
generation.

On older nixpkgs, this generates autoloads twice, which should not be an
issue (for the 4 trivialBuild packages we have).
This commit is contained in:
Marien Zwart 2024-09-01 23:41:24 +10:00
parent 6d16fb7c50
commit 598ae49a4b
No known key found for this signature in database
1 changed files with 17 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

17
elisp-packages.nix
View file

@ -95,6 +95,11 @@
}; };
packageRequires = [ eself.org ]; packageRequires = [ eself.org ];
sourceRoot = "source/lisp"; sourceRoot = "source/lisp";
# Generate an autoload file picked up by generate-nix-autoloads in build-profile.
# nixpkgs used to do this for us, but stopped because it wasn't loading that file...
postInstall = ''
emacs --batch -l package --eval "(package-generate-autoloads \"org-contrib\" \"$LISPDIR\")"
'';
}; };
sln-mode = esuper.trivialBuild { sln-mode = esuper.trivialBuild {
pname = "sln-mode"; pname = "sln-mode";
@ -105,6 +110,10 @@
# Straight uses a recipe from el-get that specifiecs the font-lock-ext # Straight uses a recipe from el-get that specifiecs the font-lock-ext
# dependency. # dependency.
buildInputs = [ eself.font-lock-ext ]; buildInputs = [ eself.font-lock-ext ];
# Generate autoloads (see org-contrib for details)
postInstall = ''
emacs --batch -l package --eval "(package-generate-autoloads \"sln-mode\" \"$LISPDIR\")"
'';
}; };
# Straight checks for git's presence at import time. # Straight checks for git's presence at import time.
# We could probably get by with feeding it /bin/true or similar, # We could probably get by with feeding it /bin/true or similar,
@ -124,6 +133,10 @@
sourceRoot=$filteredSrc sourceRoot=$filteredSrc
''; '';
nativeBuildInputs = [ git ]; nativeBuildInputs = [ git ];
# Generate autoloads (see org-contrib for details)
postInstall = ''
emacs --batch -l package --eval "(package-generate-autoloads \"straight\" \"$LISPDIR\")"
'';
}; };
# Nix uses a Melpa recipe that assumes the upstream CMake repo layout. # Nix uses a Melpa recipe that assumes the upstream CMake repo layout.
# Doom uses emacsmirror and sets :files (:defaults "*"). # Doom uses emacsmirror and sets :files (:defaults "*").
@ -133,6 +146,10 @@
meta = { meta = {
description = "build cmake-mode from emacsmirror for Doom"; description = "build cmake-mode from emacsmirror for Doom";
}; };
# Generate autoloads (see org-contrib for details)
postInstall = ''
emacs --batch -l package --eval "(package-generate-autoloads \"cmake-mode\" \"$LISPDIR\")"
'';
}; };
# Doom uses a recipe with :files (:defaults "*"), which MELPA's package-build # Doom uses a recipe with :files (:defaults "*"), which MELPA's package-build
# rejects because it includes dotfiles # rejects because it includes dotfiles