refactor(emacs): use lib.makeBinPath

This commit is contained in:
Madeleine Sydney
2025-04-16 17:12:16 -06:00
parent df4f1b86eb
commit a81b7706c0

View File

@@ -62,27 +62,24 @@ in {
name = "sydmacs"; name = "sydmacs";
paths = [ ewp ]; paths = [ ewp ];
nativeBuildInputs = [ pkgs.makeWrapper ]; nativeBuildInputs = [ pkgs.makeWrapper ];
buildInputs = [ postBuild =
pkgs.git # Dependency of Straight.el. let runtime-binaries = [
my-aspell my-aspell
pkgs.direnv pkgs.git # Dependency of Straight.el.
pkgs.ghostscript # For TeX. pkgs.ghostscript # For TeX.
my-tex
pkgs.unzip # For jump-to-source.
]; ];
postBuild = '' in ''
find "$out/bin" -name emacs -or -name "emacs-*" \ find "$out/bin" -name emacs -or -name "emacs-*" \
| while IFS= read -r emacs; do | while IFS= read -r emacs; do
echo "emacs: $emacs"
wrapProgram "$emacs" \ wrapProgram "$emacs" \
--add-flags "--init-directory \"${emacsConfigDir}\"" \ --add-flags "--init-directory \"${emacsConfigDir}\"" \
--set EMACS_STRAIGHT_BASE_DIR "${straightBaseDir}" \ --set EMACS_STRAIGHT_BASE_DIR "${straightBaseDir}" \
--set EMACS_CACHE_DIR "${emacsCacheDir}" \ --set EMACS_CACHE_DIR "${emacsCacheDir}" \
--set EMACS_DATA_DIR "${emacsDataDir}" \ --set EMACS_DATA_DIR "${emacsDataDir}" \
--prefix PATH : "${pkgs.git}/bin" \ --set ASPELL_CONF "dict-dir ${my-aspell}/lib/aspell" \
--prefix PATH : "${my-aspell}/bin" \ --prefix PATH : "${lib.makeBinPath runtime-binaries}"
--prefix PATH : "${pkgs.direnv}/bin" \
--prefix PATH : "${my-tex}/bin" \
--prefix PATH : "${pkgs.unzip}/bin" \
--set ASPELL_CONF "dict-dir ${my-aspell}/lib/aspell"
done done
''; '';
meta = emacsBasePackage.meta; meta = emacsBasePackage.meta;