From 2e538a0f55e3c40b2b02ee1c750f145eeb1cd27f Mon Sep 17 00:00:00 2001
From: Frederik Rietdijk <fridh@fridh.nl>
Date: Tue, 2 Aug 2016 08:39:55 +0200
Subject: [PATCH] kde5.yakuake: use kdeWrapper

---
 pkgs/applications/misc/yakuake/3.0.nix | 93 +++++++++++++-------------
 1 file changed, 45 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/misc/yakuake/3.0.nix b/pkgs/applications/misc/yakuake/3.0.nix
index f3aff480914..4ccef7f435a 100644
--- a/pkgs/applications/misc/yakuake/3.0.nix
+++ b/pkgs/applications/misc/yakuake/3.0.nix
@@ -1,8 +1,9 @@
-{ stdenv
+{ kdeDerivation
 , lib
 , fetchurl
-, cmake
-, extra-cmake-modules
+, kdoctools
+, kdeWrapper
+, ecm
 , karchive
 , kcrash
 , kdbusaddons
@@ -14,53 +15,49 @@
 , konsole
 , kparts
 , kwindowsystem
-, makeQtWrapper
-
 }:
 
 let
-  pname = "yakuake";
-  version = "3.0.2";
+  unwrapped = let
+    pname = "yakuake";
+    version = "3.0.2";
+  in kdeDerivation rec {
+    name = "${pname}-${version}";
+
+    src = fetchurl {
+      url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
+      sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
+    };
+
+    buildInputs = [
+      karchive
+      kcrash
+      kdbusaddons
+      ki18n
+      kiconthemes
+      knewstuff
+      knotifications
+      knotifyconfig
+      kparts
+      kwindowsystem
+    ];
+
+    nativeBuildInputs = [
+      ecm kdoctools
+    ];
+
+    meta = {
+      homepage = https://yakuake.kde.org;
+      description = "Quad-style terminal emulator for KDE";
+      maintainers = with lib.maintainers; [ fridh ];
+    };
+  };
+
+
 in
-stdenv.mkDerivation rec {
-  name = "${pname}-${version}";
-
-  src = fetchurl {
-    url = "http://download.kde.org/stable/${pname}/${version}/src/${name}.tar.xz";
-    sha256 = "0vcdji1k8d3pz7k6lkw8ighkj94zff2l2cf9v1avf83f4hjyfhg5";
-  };
-
-  buildInputs = [
-    cmake
-    extra-cmake-modules
-    karchive
-    kcrash
-    kdbusaddons
-    ki18n
-    kiconthemes
-    knewstuff
-    knotifications
-    knotifyconfig
-    kparts
-    kwindowsystem
-  ];
-
-  nativeBuildInputs = [
-    extra-cmake-modules
-    makeQtWrapper
-  ];
-
-  propagatedUserEnvPkgs = [
-    konsole
-  ];
-
-  postInstall = ''
-    wrapQtProgram "$out/bin/yakuake"
-  '';
-
-  meta = {
-    homepage = https://yakuake.kde.org;
-    description = "Quad-style terminal emulator for KDE";
-    maintainers = with lib.maintainers; [ fridh ];
-  };
+kdeWrapper unwrapped
+{
+  targets = [ "bin/yakuake" ];
+  paths = [ konsole.unwrapped ];
 }
+