qt5: move kdeDerivation to qt5.mkDerivation

This commit is contained in:
Thomas Tuegel
2017-06-02 10:49:32 -05:00
parent 210f688802
commit 7b6f8dc77f
18 changed files with 93 additions and 73 deletions

View File

@@ -1,4 +1,4 @@
{ kdeDerivation, lib, fetchurl }:
{ mkDerivation, lib, fetchurl }:
let
mirror = "mirror://kde";
@@ -12,7 +12,7 @@ let
sname = args.sname or name;
inherit (srcs."${sname}") src version;
in
kdeDerivation (args // {
mkDerivation (args // {
name = "${name}-${version}";
inherit src;

View File

@@ -25,7 +25,7 @@ existing packages here and modify it as necessary.
*/
{
libsForQt5, kdeDerivation, lib, fetchurl,
libsForQt5, lib, fetchurl,
gconf,
debug ? false,
}:
@@ -35,7 +35,8 @@ let
let
callPackage = self.newScope {
plasmaPackage = import ./build-support/package.nix {
inherit kdeDerivation lib fetchurl;
inherit lib fetchurl;
mkDerivation = libsForQt5.callPackage ({ mkDerivation }: mkDerivation) {};
};
};
in {