Merge pull request #317 from adamcstephens/fix-packagedir-hm
fix doomPackageDir in HM module
This commit is contained in:
@ -32,6 +32,7 @@ in
|
|||||||
Can be provided as a directory or derivation. If not given, package
|
Can be provided as a directory or derivation. If not given, package
|
||||||
environment is built against `doomPrivateDir`.
|
environment is built against `doomPrivateDir`.
|
||||||
'';
|
'';
|
||||||
|
default = cfg.doomPrivateDir;
|
||||||
apply = path: if lib.isStorePath path then path else builtins.path { inherit path; };
|
apply = path: if lib.isStorePath path then path else builtins.path { inherit path; };
|
||||||
example = literalExample ''
|
example = literalExample ''
|
||||||
doomPackageDir = pkgs.linkFarm "my-doom-packages" [
|
doomPackageDir = pkgs.linkFarm "my-doom-packages" [
|
||||||
@ -106,7 +107,7 @@ in
|
|||||||
emacs = pkgs.callPackage self {
|
emacs = pkgs.callPackage self {
|
||||||
extraPackages = (epkgs: cfg.extraPackages);
|
extraPackages = (epkgs: cfg.extraPackages);
|
||||||
emacsPackages = pkgs.emacsPackagesFor cfg.emacsPackage;
|
emacsPackages = pkgs.emacsPackagesFor cfg.emacsPackage;
|
||||||
inherit (cfg) doomPrivateDir extraConfig emacsPackagesOverlay;
|
inherit (cfg) doomPrivateDir doomPackageDir extraConfig emacsPackagesOverlay;
|
||||||
dependencyOverrides = inputs;
|
dependencyOverrides = inputs;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
|
Reference in New Issue
Block a user