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

Use derivation attributes

Browse source 
Mostly removes string interpolation from build commands, by mechanically
pushing inputs up to derivation attributes.

Should be equivalent, but makes the derivations more readable (and
potentially allows splitting build commands out to separate files).
This commit is contained in:
Marien Zwart 2024-06-01 20:54:46 +10:00
parent b16774f129
commit 8f8f118d94
No known key found for this signature in database
1 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

84
default.nix
View file

@ -267,10 +267,11 @@ let
} // fetchGitArgs)) } // fetchGitArgs))
else builtins.fetchGit fetchGitArgs; else builtins.fetchGit fetchGitArgs;
# Run locally to avoid a network roundtrip. # Run locally to avoid a network roundtrip.
reqfile = runCommandLocal "${name}-deps" { } '' reqfile = runCommandLocal "${name}-deps" {
${lib.getExe emacs} -Q --batch --script \ inherit src;
${./build-helpers/print-deps.el} ${src} > $out emacs = lib.getExe emacs;
''; printDeps = ./build-helpers/print-deps.el;
} "$emacs -Q --batch --script $printDeps $src > $out";
reqjson = lib.importJSON reqfile; reqjson = lib.importJSON reqfile;
# json-encode encodes the empty list as null (nil), not []. # json-encode encodes the empty list as null (nil), not [].
reqlist = if reqjson == null then [ ] else reqjson; reqlist = if reqjson == null then [ ] else reqjson;
@ -306,46 +307,48 @@ let
# Force local build in case the user init.el does something weird. # Force local build in case the user init.el does something weird.
doomProfile = runCommandLocal "doom-profile" doomProfile = runCommandLocal "doom-profile"
{ {
env = { inherit doomDir doomIntermediates doomSource profileName runtimeShell;
EMACS = lib.getExe emacsWithPackages; buildProfileLoader = ./build-helpers/build-profile-loader;
# Enable this to troubleshoot failures at this step. buildProfile = ./build-helpers/build-profile;
#DEBUG = "1"; initEl = ./init.el;
}; EMACS = lib.getExe emacsWithPackages;
# Enable this to troubleshoot failures at this step.
#DEBUG = "1";
# Required to avoid Doom erroring out at startup. # Required to avoid Doom erroring out at startup.
nativeBuildInputs = [ git ]; nativeBuildInputs = [ git ];
} '' } ''
mkdir $out $out/loader $out/doomdir $out/profile $out/straight mkdir $out $out/loader $out/doomdir $out/profile $out/straight
ln -s ${doomDir}/* $out/doomdir/ ln -s $doomDir/* $out/doomdir/
# yasnippet logs an error at startup if snippets/ does not exist. # yasnippet logs an error at startup if snippets/ does not exist.
if ! [[ -e $out/doomdir/snippets ]]; then if ! [[ -e $out/doomdir/snippets ]]; then
mkdir $out/doomdir/snippets mkdir $out/doomdir/snippets
fi fi
rm $out/doomdir/init.el rm $out/doomdir/init.el
if [[ -z "${profileName}" ]]; then if [[ -z "$profileName" ]]; then
setProfile="(setq doom-profile-dir \"$out/profile\")" setProfile="(setq doom-profile-dir \"$out/profile\")"
else else
setProfile="" setProfile=""
fi fi
substitute ${./init.el} $out/doomdir/init.el \ substitute $initEl $out/doomdir/init.el \
--subst-var-by maybe-set-profile-dir "$setProfile" \ --subst-var-by maybe-set-profile-dir "$setProfile" \
--subst-var-by profile-name "${profileName}" \ --subst-var-by profile-name "$profileName" \
--subst-var-by user-init "${doomDir}/init.el" \ --subst-var-by user-init "$doomDir/init.el" \
--subst-var-by straight-base-dir $out --subst-var-by straight-base-dir $out
ln -sf ${doomIntermediates}/packages.el $out/doomdir/ ln -sf $doomIntermediates/packages.el $out/doomdir/
export DOOMDIR=$out/doomdir export DOOMDIR=$out/doomdir
# DOOMLOCALDIR must be writable, Doom creates some subdirectories. # DOOMLOCALDIR must be writable, Doom creates some subdirectories.
export DOOMLOCALDIR=$(mktemp -d) export DOOMLOCALDIR=$(mktemp -d)
if [[ -n "${profileName}" ]]; then if [[ -n "$profileName" ]]; then
export DOOMPROFILELOADFILE=$out/loader/init.el export DOOMPROFILELOADFILE=$out/loader/init.el
${runtimeShell} ${doomSource}/bin/doomscript ${./build-helpers/build-profile-loader} \ $runtimeShell $doomSource/bin/doomscript $buildProfileLoader \
-n "${profileName}" -b "$out" ${optionalString noProfileHack "-u"} -n "$profileName" -b "$out" ${optionalString noProfileHack "-u"}
# With DOOMPROFILE set, doom-state-dir and friends are HOME-relative. # With DOOMPROFILE set, doom-state-dir and friends are HOME-relative.
export HOME=$(mktemp -d) export HOME=$(mktemp -d)
export DOOMPROFILE='${profileName}'; export DOOMPROFILE="$profileName";
fi fi
${runtimeShell} ${doomSource}/bin/doomscript ${./build-helpers/build-profile} $runtimeShell $doomSource/bin/doomscript $buildProfile
# Similar to audit-tmpdir.sh in nixpkgs. # Similar to audit-tmpdir.sh in nixpkgs.
if grep -q -F "$TMPDIR/" -r $out; then if grep -q -F "$TMPDIR/" -r $out; then
@ -358,47 +361,48 @@ let
# Use runCommand, not runCommandLocal, because makeBinaryWrapper pulls in a compiler. # Use runCommand, not runCommandLocal, because makeBinaryWrapper pulls in a compiler.
doomEmacs = runCommand "doom-emacs" { doomEmacs = runCommand "doom-emacs" {
# emacsWithPackages also accessed externally (for pushing to Cachix).
inherit doomProfile doomLocalDir doomSource emacsWithPackages profileName;
nativeBuildInputs = [ makeBinaryWrapper ]; nativeBuildInputs = [ makeBinaryWrapper ];
# Expose this so we can push it to cachix.
inherit emacsWithPackages;
} '' } ''
if [[ -z "${profileName}" ]]; then if [[ -z "$profileName" ]]; then
profileArgs=() profileArgs=()
else else
profileArgs=( profileArgs=(
--set DOOMPROFILELOADFILE ${doomProfile}/loader/init.el --set DOOMPROFILELOADFILE $doomProfile/loader/init.el
--set DOOMPROFILE ${profileName} --set DOOMPROFILE "$profileName"
) )
fi fi
makeWrapper ${emacsWithPackages}/bin/emacs $out/bin/doom-emacs \ makeWrapper $emacsWithPackages/bin/emacs $out/bin/doom-emacs \
"''${profileArgs[@]}" \ "''${profileArgs[@]}" \
--set DOOMDIR ${doomProfile}/doomdir \ --set DOOMDIR $doomProfile/doomdir \
--set-default DOOMLOCALDIR "${doomLocalDir}" \ --set-default DOOMLOCALDIR "$doomLocalDir" \
--add-flags "--init-directory=${doomSource}" --add-flags "--init-directory=$doomSource"
makeWrapper ${doomSource}/bin/doomscript $out/bin/doomscript \ makeWrapper $doomSource/bin/doomscript $out/bin/doomscript \
--set EMACS ${emacsWithPackages}/bin/emacs \ --set EMACS $emacsWithPackages/bin/emacs \
--set-default DOOMLOCALDIR "${doomLocalDir}" --set-default DOOMLOCALDIR "$doomLocalDir"
makeWrapper ${doomSource}/bin/doom $out/bin/doom \ makeWrapper $doomSource/bin/doom $out/bin/doom \
--set EMACS ${emacsWithPackages}/bin/emacs \ --set EMACS $emacsWithPackages/bin/emacs \
"''${profileArgs[@]}" \ "''${profileArgs[@]}" \
--set DOOMDIR ${doomProfile}/doomdir \ --set DOOMDIR $doomProfile/doomdir \
--set-default DOOMLOCALDIR "${doomLocalDir}" --set-default DOOMLOCALDIR "$doomLocalDir"
''; '';
emacsWithDoom = runCommand (lib.appendToName "with-doom" emacs).name { emacsWithDoom = runCommand (lib.appendToName "with-doom" emacs).name {
inherit (emacs) meta; inherit (emacs) meta;
inherit doomEmacs emacs;
} '' } ''
mkdir -p $out/bin mkdir -p $out/bin
ln -s ${emacs}/bin/* $out/bin/ ln -s $emacs/bin/* $out/bin/
rm $out/bin/emacs-* rm $out/bin/emacs-*
ln -sf ${doomEmacs}/bin/doom-emacs $out/bin/emacs ln -sf $doomEmacs/bin/doom-emacs $out/bin/emacs
ln -sf ${doomEmacs}/bin/{doom,doomscript} $out/bin/ ln -sf $doomEmacs/bin/{doom,doomscript} $out/bin/
mkdir -p $out/share mkdir -p $out/share
# Don't link everything: the systemd units would still refer to normal Emacs. # Don't link everything: the systemd units would still refer to normal Emacs.
# This links the same stuff emacsWithPackages does. # This links the same stuff emacsWithPackages does.
for dir in applications icons info man; do for dir in applications icons info man; do
ln -s ${emacs}/share/$dir $out/share/$dir ln -s $emacs/share/$dir $out/share/$dir
done done
''; '';
in in