ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-30 09:37:59 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #292376 from SuperSandro2000/plasma6-fix-meta-position

Browse Source 
plasma6: fix meta.position
This commit is contained in:
K900 2024-03-01 09:27:42 +03:00 committed by GitHub
commit 547ca1cff6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
pkgs/kde/lib/mk-kde-derivation.nix
View File

@ -78,7 +78,6 @@ in
extraNativeBuildInputs ? [],
extraPropagatedBuildInputs ? [],
extraCmakeFlags ? [],
meta ? {},
...
} @ args: let
# FIXME(later): this is wrong for cross, some of these things really need to go into nativeBuildInputs,
@ -101,18 +100,6 @@ in
cmakeFlags = ["-DQT_MAJOR_VERSION=6"] ++ extraCmakeFlags;
separateDebugInfo = true;
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;
}
// meta;
};
cleanArgs = builtins.removeAttrs args [
@ -122,5 +109,17 @@ in
"extraCmakeFlags"
"meta"
];
meta = let
pos = builtins.unsafeGetAttrPos "pname" args;
in {
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 { });
in
stdenv.mkDerivation (defaultArgs // cleanArgs)
stdenv.mkDerivation (defaultArgs // cleanArgs) // { inherit meta; }