Skip to content

Commit

Permalink
Merge pull request #297783 from K900/fix-kde-meta-better
Browse files Browse the repository at this point in the history
kdePackages.mkKdeDerivation: pass pos explicitly instead of as part of meta
  • Loading branch information
K900 committed Mar 21, 2024
2 parents e34b9b4 + 7664d1b commit 9b1635f
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions pkgs/kde/lib/mk-kde-derivation.nix
Expand Up @@ -112,16 +112,15 @@ in
"meta"
];

meta = let
pos = builtins.unsafeGetAttrPos "pname" args;
in {
meta = {
description = projectInfo.${pname}.description;
homepage = "https://invent.kde.org/${projectInfo.${pname}.repo_path}";
license = lib.filter (l: l != null) (map (l: licensesBySpdxId.${l}) licenseInfo.${pname});
maintainers = lib.teams.qt-kde.members;
# Platforms are currently limited to what upstream tests in CI, but can be extended if there's interest.
platforms = lib.platforms.linux ++ lib.platforms.freebsd;
position = "${pos.file}:${toString pos.line}";
} // (args.meta or { });

pos = builtins.unsafeGetAttrPos "pname" args;
in
stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta; })
stdenv.mkDerivation (defaultArgs // cleanArgs // { inherit meta pos; })

0 comments on commit 9b1635f

Please sign in to comment.