kdeApplications: move mkDerivation

+21 -28
-20
pkgs/applications/kde/build-support/application.nix
··· 1 - { mkDerivation, lib, srcs }: 2 - 3 - args: 4 - 5 - let 6 - inherit (args) name; 7 - sname = args.sname or name; 8 - inherit (srcs."${sname}") src version; 9 - in 10 - mkDerivation (args // { 11 - name = "${name}-${version}"; 12 - inherit src; 13 - 14 - outputs = args.outputs or [ "out" "dev" ]; 15 - 16 - meta = { 17 - platforms = lib.platforms.linux; 18 - homepage = http://www.kde.org; 19 - } // (args.meta or {}); 20 - })
+21 -8
pkgs/applications/kde/default.nix
··· 33 33 let 34 34 mirror = "mirror://kde"; 35 35 srcs = import ./srcs.nix { inherit fetchurl mirror; }; 36 - in 36 + 37 + mkDerivation = args: 38 + let 39 + inherit (args) name; 40 + sname = args.sname or name; 41 + inherit (srcs."${sname}") src version; 42 + mkDerivation = 43 + libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; 44 + in 45 + mkDerivation (args // { 46 + name = "${name}-${version}"; 47 + inherit src; 48 + 49 + outputs = args.outputs or [ "out" ]; 37 50 38 - let 51 + meta = { 52 + platforms = lib.platforms.linux; 53 + homepage = "http://www.kde.org"; 54 + } // (args.meta or {}); 55 + }); 39 56 40 57 packages = self: with self; 41 58 let 42 59 callPackage = self.newScope { 60 + inherit mkDerivation; 61 + 43 62 # Team of maintainers assigned to the KDE PIM suite 44 63 kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; 45 - 46 - mkDerivation = import ./build-support/application.nix { 47 - inherit lib; 48 - inherit srcs; 49 - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; 50 - }; 51 64 }; 52 65 in { 53 66 kdelibs = callPackage ./kdelibs { inherit attica phonon; };