diff options
author | Naïm Favier <n@monade.li> | 2022-11-22 11:11:04 +0100 |
---|---|---|
committer | Naïm Favier <n@monade.li> | 2022-11-23 10:33:22 +0100 |
commit | 74ad812b931aef32941c4823a04bf9e90f06fbc1 (patch) | |
tree | 2ee3d6cf710385f2f6dfac0a4dc98d281bad07b5 /pkgs/development/tools/yarn2nix-moretea | |
parent | 287131c409bcb8fb53c401ed028815c3e20b6b39 (diff) |
mkYarnPackage: fix meta
Correctly inherit meta attributes from `package.json`.
Diffstat (limited to 'pkgs/development/tools/yarn2nix-moretea')
-rw-r--r-- | pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 76d1df8be645f..459de3928209a 100644 --- a/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -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 { |