mirror of
https://github.com/nix-community/dream2nix.git
synced 2024-12-04 20:22:14 +03:00
Merge pull request #102 from tgunnoe/workspace-name-fix
fix: use name attr before workspace path
This commit is contained in:
commit
2b4c65a589
@ -289,10 +289,11 @@
|
||||
})
|
||||
packageJsonDeps;
|
||||
|
||||
workspaceDependendencies =
|
||||
workspaceDependencies =
|
||||
l.mapAttrsToList
|
||||
(wsName: wsJson: {
|
||||
name = wsName;
|
||||
(wsPath: wsJson: {
|
||||
# If the name attr doesn't exist, use the relative path as name
|
||||
name = wsJson.name or wsPath;
|
||||
version = wsJson.version or "unknown";
|
||||
})
|
||||
workspacesPackageJson;
|
||||
@ -300,7 +301,7 @@
|
||||
{
|
||||
name = defaultPackage;
|
||||
version = packageJson.version or "unknown";
|
||||
dependencies = defaultPackageDependencies ++ workspaceDependendencies;
|
||||
dependencies = defaultPackageDependencies ++ workspaceDependencies;
|
||||
}
|
||||
];
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user