awesome-emacs/nix-doom-emacs
1
0
Fork 0
mirror of https://github.com/nix-community/nix-doom-emacs synced 2025-09-14 15:46:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

Clean-ups

Browse Source
This commit is contained in:
Thiago Kenji Okada
2022-11-01 12:50:51 +00:00
parent e9a0c496d8
commit 5be4e7ee86
1 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
default.nix
View File

@@ -75,7 +75,7 @@
*/ */
, dependencyOverrides ? { } , dependencyOverrides ? { }
, lib, pkgs, stdenv, buildEnv, makeWrapper , lib, pkgs, stdenv, buildEnv, makeWrapper
, runCommand, fetchFromGitHub, substituteAll, writeShellScript , runCommand, fetchFromGitHub, writeShellScript
, writeShellScriptBin, writeTextDir }: , writeShellScriptBin, writeTextDir }:
assert (lib.assertMsg ((builtins.isPath doomPrivateDir) assert (lib.assertMsg ((builtins.isPath doomPrivateDir)
@@ -136,7 +136,7 @@ let
emacsPackages.overrideScope' overrides; emacsPackages.overrideScope' overrides;
emacs = emacsPackages.emacsWithPackages extraPackages; emacs = emacsPackages.emacsWithPackages extraPackages;
emacsLoadFiles = [ ./advice.el ]; emacsLoadFiles = [ ./advice.el ];
emacsArgs = [ "--" "install" ]; emacsArgs = [ "--" "install" "--no-hooks" "--no-fonts" "--no-env" ];
# Need to reference a store path here, as byte-compilation will bake-in # Need to reference a store path here, as byte-compilation will bake-in
# absolute path to source files. # absolute path to source files.
@@ -193,16 +193,13 @@ let
src = doomSrc; src = doomSrc;
patches = [ patches = [
(substituteAll { ./patches/nix-integration.patch
src = ./patches/nix-integration.patch;
local = doomLocal;
})
]; ];
buildPhase = '' buildPhase = ''
patchShebangs bin
# Remove the windows wrapper for the CLI so the build doesn't fail # Remove the windows wrapper for the CLI so the build doesn't fail
rm bin/doom.cmd rm bin/doom.cmd
patchShebangs bin
''; '';
installPhase = '' installPhase = ''
mkdir -p $out mkdir -p $out
@@ -229,8 +226,7 @@ let
# without installing ~/.emacs.d # without installing ~/.emacs.d
emacs = let emacs = let
load-config-from-site = writeTextDir "share/emacs/site-lisp/default.el" '' load-config-from-site = writeTextDir "share/emacs/site-lisp/default.el" ''
(message "doom-emacs is not placed in `doom-private-dir', (message "doom-emacs is not placed in `doom-private-dir', loading from `site-lisp'")
loading from `site-lisp'")
${# TODO: remove once Emacs 29+ is released and commonly available ${# TODO: remove once Emacs 29+ is released and commonly available
lib.optionalString (!isEmacs29) '' lib.optionalString (!isEmacs29) ''
(load "${doom-emacs}/early-init.el") (load "${doom-emacs}/early-init.el")
@@ -271,10 +267,10 @@ in emacs.overrideAttrs (esuper:
wrapEmacs() { wrapEmacs() {
local -a wrapArgs=( local -a wrapArgs=(
--set NIX_DOOM_EMACS_BINARY $1 --set NIX_DOOM_EMACS_BINARY $1
--set __DEBUG_doom_emacs_DIR ${doom-emacs}
--set __DEBUG_doomLocal_DIR ${doomLocal}
--set-default DOOMDIR ${doomDir} --set-default DOOMDIR ${doomDir}
--set-default DOOMLOCALDIR ${doomLocal} --set-default DOOMLOCALDIR ${doomLocal}
--set-default __DEBUG_doom_emacs_DIR ${doom-emacs}
--set-default __DEBUG_doomLocal_DIR ${doomLocal}
) )
${initDirArgs} ${initDirArgs}