Merge branch 'issue/14'

This commit is contained in:
László Vaskó
2020-06-22 11:25:14 +02:00

View File

@ -172,19 +172,17 @@ let
load-config-from-site load-config-from-site
])); ]));
in in
pkgs.runCommand "doom-emacs" { emacs.overrideAttrs (esuper: {
inherit emacs; buildCommand = esuper.buildCommand + ''
buildInputs = [ emacs ]; for prog in $out/bin/*; do
nativeBuildInputs = [ makeWrapper ]; wrapProgram $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
} ''
mkdir -p $out/bin
for prog in $emacs/bin/*; do
makeWrapper $prog $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
done done
# emacsWithPackages assumes share/emacs/site-lisp/subdirs.el # emacsWithPackages assumes share/emacs/site-lisp/subdirs.el
# exists, but doesn't pass it along. When home-manager calls # exists, but doesn't pass it along. When home-manager calls
# emacsWithPackages again on this derivation, it fails due to # emacsWithPackages again on this derivation, it fails due to
# a dangling link to subdirs.el. # a dangling link to subdirs.el.
# https://github.com/NixOS/nixpkgs/issues/66706 # https://github.com/NixOS/nixpkgs/issues/66706
ln -s ${emacs.emacs}/share $out rm -rf $out/share
'' ln -s ${esuper.emacs}/share $out
'';
})