mirror of
https://github.com/nix-community/nix-doom-emacs
synced 2025-08-07 12:47:32 -05:00
Merge branch 'issue/14'
This commit is contained in:
18
default.nix
18
default.nix
@ -172,19 +172,17 @@ let
|
||||
load-config-from-site
|
||||
]));
|
||||
in
|
||||
pkgs.runCommand "doom-emacs" {
|
||||
inherit emacs;
|
||||
buildInputs = [ emacs ];
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
} ''
|
||||
mkdir -p $out/bin
|
||||
for prog in $emacs/bin/*; do
|
||||
makeWrapper $prog $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
|
||||
emacs.overrideAttrs (esuper: {
|
||||
buildCommand = esuper.buildCommand + ''
|
||||
for prog in $out/bin/*; do
|
||||
wrapProgram $out/bin/$(basename $prog) --set DOOMDIR ${doomDir}
|
||||
done
|
||||
# emacsWithPackages assumes share/emacs/site-lisp/subdirs.el
|
||||
# exists, but doesn't pass it along. When home-manager calls
|
||||
# emacsWithPackages again on this derivation, it fails due to
|
||||
# a dangling link to subdirs.el.
|
||||
# https://github.com/NixOS/nixpkgs/issues/66706
|
||||
ln -s ${emacs.emacs}/share $out
|
||||
''
|
||||
rm -rf $out/share
|
||||
ln -s ${esuper.emacs}/share $out
|
||||
'';
|
||||
})
|
||||
|
Reference in New Issue
Block a user