mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-12-23 06:21:30 +03:00
fix: forward incoming modules when using importPackages
interface
Before this patch, if a user calls `importPackages` and includes custom modules in the call, those would be lost. @moduon MT-1075
This commit is contained in:
parent
f8626675d4
commit
8576970852
@ -28,14 +28,17 @@
|
||||
module: type:
|
||||
self.lib.evalModules (forwardedArgs
|
||||
// {
|
||||
modules = [
|
||||
(packagesDirPath + "/${module}")
|
||||
{
|
||||
paths.projectRoot = projectRoot;
|
||||
paths.projectRootFile = projectRootFile;
|
||||
paths.package = "/${packagesDir}/${module}";
|
||||
}
|
||||
];
|
||||
modules =
|
||||
args.modules
|
||||
or []
|
||||
++ [
|
||||
(packagesDirPath + "/${module}")
|
||||
{
|
||||
paths.projectRoot = projectRoot;
|
||||
paths.projectRootFile = projectRootFile;
|
||||
paths.package = "/${packagesDir}/${module}";
|
||||
}
|
||||
];
|
||||
})
|
||||
)
|
||||
(builtins.readDir packagesDirPath);
|
||||
|
Loading…
Reference in New Issue
Block a user