awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-08-03 12:27:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge branch 'issue/14'"

Browse Source 
This reverts commit 4f34bddc8d, reversing
changes made to f01b817c73.

Resolves: #17
This commit is contained in:
László Vaskó
2020-06-24 09:50:14 +02:00
parent 4f34bddc8d
commit 2c1bf99ddf
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
default.nix
View File

@ -172,17 +172,19 @@ let
load-config-from-site load-config-from-site
])); ]));
in in
emacs.overrideAttrs (esuper: { pkgs.runCommand "doom-emacs" {
buildCommand = esuper.buildCommand + '' inherit emacs;
for prog in $out/bin/*; do buildInputs = [ emacs ];
wrapProgram $out/bin/$(basename $prog) --set DOOMDIR ${doomDir} nativeBuildInputs = [ makeWrapper ];
} ''
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
rm -rf $out/share ln -s ${emacs.emacs}/share $out
ln -s ${esuper.emacs}/share $out ''
'';
})