diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2017-05-21 08:32:51 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@mailbox.org> | 2017-08-21 06:51:31 -0500 |
commit | b3ffeab007b4785545f6c96e4e9cb60b83bb384b (patch) | |
tree | 1abaa4118ddd2f0effbd041de1cc388df13196d3 /pkgs/applications/kde | |
parent | 597a1c6a9edd76ef9e32ee3f0122e758d2205756 (diff) | |
download | nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.tar nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.tar.gz nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.tar.bz2 nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.tar.lz nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.tar.xz nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.tar.zst nixlib-b3ffeab007b4785545f6c96e4e9cb60b83bb384b.zip |
kdeApplications: move mkDerivation
Diffstat (limited to 'pkgs/applications/kde')
-rw-r--r-- | pkgs/applications/kde/build-support/application.nix | 20 | ||||
-rw-r--r-- | pkgs/applications/kde/default.nix | 29 |
2 files changed, 21 insertions, 28 deletions
diff --git a/pkgs/applications/kde/build-support/application.nix b/pkgs/applications/kde/build-support/application.nix deleted file mode 100644 index 087f355b4faf..000000000000 --- a/pkgs/applications/kde/build-support/application.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ mkDerivation, lib, srcs }: - -args: - -let - inherit (args) name; - sname = args.sname or name; - inherit (srcs."${sname}") src version; -in -mkDerivation (args // { - name = "${name}-${version}"; - inherit src; - - outputs = args.outputs or [ "out" "dev" ]; - - meta = { - platforms = lib.platforms.linux; - homepage = http://www.kde.org; - } // (args.meta or {}); -}) diff --git a/pkgs/applications/kde/default.nix b/pkgs/applications/kde/default.nix index a9e11c7ba242..24b73f415ad9 100644 --- a/pkgs/applications/kde/default.nix +++ b/pkgs/applications/kde/default.nix @@ -33,21 +33,34 @@ still shows most of the available features is in `./gwenview.nix`. let mirror = "mirror://kde"; srcs = import ./srcs.nix { inherit fetchurl mirror; }; -in -let + mkDerivation = args: + let + inherit (args) name; + sname = args.sname or name; + inherit (srcs."${sname}") src version; + mkDerivation = + libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; + in + mkDerivation (args // { + name = "${name}-${version}"; + inherit src; + + outputs = args.outputs or [ "out" ]; + + meta = { + platforms = lib.platforms.linux; + homepage = "http://www.kde.org"; + } // (args.meta or {}); + }); packages = self: with self; let callPackage = self.newScope { + inherit mkDerivation; + # Team of maintainers assigned to the KDE PIM suite kdepimTeam = with lib.maintainers; [ ttuegel vandenoever ]; - - mkDerivation = import ./build-support/application.nix { - inherit lib; - inherit srcs; - mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {}; - }; }; in { kdelibs = callPackage ./kdelibs { inherit attica phonon; }; |