Plugin dir attribute can also be a path.
This commit is contained in:
parent
b83e5c9de5
commit
8dd643ceeb
1 changed files with 5 additions and 1 deletions
|
@ -30,7 +30,11 @@ let
|
||||||
baseNameOf plugin.short
|
baseNameOf plugin.short
|
||||||
else if (plugin ? dir && plugin.dir != null) then
|
else if (plugin ? dir && plugin.dir != null) then
|
||||||
(
|
(
|
||||||
assert ((builtins.isString plugin.dir) || (lib.isDerivation plugin.dir));
|
assert builtins.any (isType: isType plugin.dir) [
|
||||||
|
lib.isDerivation
|
||||||
|
builtins.isString
|
||||||
|
builtins.isPath
|
||||||
|
];
|
||||||
if (lib.isDerivation plugin.dir) then plugin.dir.pname else (baseNameOf plugin.dir)
|
if (lib.isDerivation plugin.dir) then plugin.dir.pname else (baseNameOf plugin.dir)
|
||||||
)
|
)
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue