emacs: allow extraConfig to reference extraPackages
This fixes the issue described in https://github.com/nix-community/home-manager/pull/1758#issuecomment-1113706592
This commit is contained in:
parent
51ea4217f7
commit
64831f938b
2 changed files with 28 additions and 12 deletions
|
|
@ -5,16 +5,32 @@ let
|
|||
testScript = pkgs.writeText "test.el" ''
|
||||
;; Emacs won't automatically load default.el when --script is specified
|
||||
(load "default")
|
||||
(kill-emacs (if (eq hm 'home-manager) 0 1))
|
||||
(let* ((test-load-config (eq hm 'home-manager))
|
||||
(test-load-package (eq (hm-test-fn) 'success))
|
||||
(is-ok (and test-load-config test-load-package)))
|
||||
(kill-emacs (if is-ok 0 1)))
|
||||
'';
|
||||
|
||||
emacsBin = "${config.programs.emacs.finalPackage}/bin/emacs";
|
||||
|
||||
mkTestPackage = epkgs:
|
||||
epkgs.trivialBuild {
|
||||
pname = "hm-test";
|
||||
src = pkgs.writeText "hm-test.el" ''
|
||||
(defun hm-test-fn () 'success)
|
||||
(provide 'hm-test)
|
||||
'';
|
||||
};
|
||||
|
||||
in lib.mkIf config.test.enableBig {
|
||||
programs.emacs = {
|
||||
enable = true;
|
||||
package = pkgs.emacs-nox;
|
||||
extraConfig = "(setq hm 'home-manager)";
|
||||
extraConfig = ''
|
||||
(require 'hm-test)
|
||||
(setq hm 'home-manager)
|
||||
'';
|
||||
extraPackages = epkgs: [ (mkTestPackage epkgs) ];
|
||||
};
|
||||
|
||||
# running emacs with --script would enable headless mode
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue