kde5_latest: merge all package sets
The three KDE package sets now have circular dependencies between them, so they can only be built if they are merged into a single package set during evaluation.
This commit is contained in:
@@ -14,29 +14,29 @@ let
|
||||
mirror = "mirror://kde";
|
||||
srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
|
||||
|
||||
kdeFramework = args:
|
||||
let
|
||||
inherit (args) name;
|
||||
inherit (srcs."${name}") src version;
|
||||
in stdenv.mkDerivation (args // {
|
||||
name = "${name}-${version}";
|
||||
inherit src;
|
||||
packages = self: with self; {
|
||||
kdeFramework = args:
|
||||
let
|
||||
inherit (args) name;
|
||||
inherit (srcs."${name}") src version;
|
||||
in stdenv.mkDerivation (args // {
|
||||
name = "${name}-${version}";
|
||||
inherit src;
|
||||
|
||||
cmakeFlags =
|
||||
(args.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
cmakeFlags =
|
||||
(args.cmakeFlags or [])
|
||||
++ [ "-DBUILD_TESTING=OFF" ]
|
||||
++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
|
||||
|
||||
meta = {
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "http://www.kde.org";
|
||||
} // (args.meta or {});
|
||||
});
|
||||
meta = {
|
||||
license = with lib.licenses; [
|
||||
lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
|
||||
];
|
||||
platforms = lib.platforms.linux;
|
||||
homepage = "http://www.kde.org";
|
||||
} // (args.meta or {});
|
||||
});
|
||||
|
||||
addPackages = self: with self; {
|
||||
attica = callPackage ./attica.nix {};
|
||||
baloo = callPackage ./baloo.nix {};
|
||||
bluez-qt = callPackage ./bluez-qt.nix {};
|
||||
@@ -109,6 +109,4 @@ let
|
||||
threadweaver = callPackage ./threadweaver.nix {};
|
||||
};
|
||||
|
||||
newScope = scope: pkgs.qt55Libs.newScope ({ inherit kdeFramework; } // scope);
|
||||
|
||||
in lib.makeScope newScope addPackages
|
||||
in packages
|
||||
|
||||
Reference in New Issue
Block a user