From 7b6f8dc77f7ba2cc28bdff390f5922befefa8b48 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Fri, 2 Jun 2017 10:49:32 -0500
Subject: qt5: move kdeDerivation to qt5.mkDerivation

---
 pkgs/desktops/plasma-5/build-support/package.nix | 4 ++--
 pkgs/desktops/plasma-5/default.nix               | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'pkgs/desktops/plasma-5')

diff --git a/pkgs/desktops/plasma-5/build-support/package.nix b/pkgs/desktops/plasma-5/build-support/package.nix
index 1e9ba016c471..64c7934cc235 100644
--- a/pkgs/desktops/plasma-5/build-support/package.nix
+++ b/pkgs/desktops/plasma-5/build-support/package.nix
@@ -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;
 
diff --git a/pkgs/desktops/plasma-5/default.nix b/pkgs/desktops/plasma-5/default.nix
index 1a8f1ed064b0..83d7d39dd866 100644
--- a/pkgs/desktops/plasma-5/default.nix
+++ b/pkgs/desktops/plasma-5/default.nix
@@ -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 {
-- 
cgit 1.4.1