fixup! override emacsWithPackages instead of wrapping it

This commit is contained in:
László Vaskó
2020-07-02 20:53:18 +02:00
parent 5fa986fe8c
commit a4d5042100

View File

@@ -172,8 +172,8 @@ let
load-config-from-site load-config-from-site
])); ]));
in in
emacs.overrideAttrs (esuper: { emacs.overrideAttrs (esuper:
buildCommand = esuper.buildCommand + '' let cmd = ''
for prog in $out/bin/*; do for prog in $out/bin/*; do
wrapProgram $out/bin/$(basename $prog) --set DOOMDIR ${doomDir} wrapProgram $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
done done
@@ -185,4 +185,15 @@ emacs.overrideAttrs (esuper: {
rm -rf $out/share rm -rf $out/share
ln -s ${esuper.emacs}/share $out ln -s ${esuper.emacs}/share $out
''; '';
}) in
if esuper ? buildCommand then
{
buildCommand = esuper.buildCommand + cmd;
}
else if esuper ? installPhase then
{
installPhase = esuper.installPhase + cmd;
}
else
abort "emacsWithPackages uses unknown derivation type"
)