Merge pull request #202328 from ncfavier/yarn-meta
This commit is contained in:
commit
12f4dc4940
1 changed files with 5 additions and 6 deletions
|
@ -303,7 +303,7 @@ in rec {
|
|||
workspaceDependenciesTransitive;
|
||||
|
||||
in stdenv.mkDerivation (builtins.removeAttrs attrs ["yarnNix" "pkgConfig" "workspaceDependencies" "packageResolutions"] // {
|
||||
inherit src pname;
|
||||
inherit src version pname;
|
||||
|
||||
name = baseName;
|
||||
|
||||
|
@ -376,11 +376,10 @@ in rec {
|
|||
|
||||
meta = {
|
||||
inherit (nodejs.meta) platforms;
|
||||
description = packageJSON.description or "";
|
||||
homepage = packageJSON.homepage or "";
|
||||
version = packageJSON.version or "";
|
||||
license = if packageJSON ? license then getLicenseFromSpdxId packageJSON.license else "";
|
||||
} // (attrs.meta or {});
|
||||
} // lib.optionalAttrs (package ? description) { inherit (package) description; }
|
||||
// lib.optionalAttrs (package ? homepage) { inherit (package) homepage; }
|
||||
// lib.optionalAttrs (package ? license) { license = getLicenseFromSpdxId package.license; }
|
||||
// (attrs.meta or {});
|
||||
});
|
||||
|
||||
yarn2nix = mkYarnPackage {
|
||||
|
|
Loading…
Reference in a new issue