From 6c79045964a2337de7d2a4a0787d7a696c326cc7 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Fri, 29 Jul 2016 09:33:58 -0500
Subject: extra-cmake-modules: separate setup hook from package

---
 pkgs/desktops/kde-5/applications/default.nix |  2 +-
 pkgs/desktops/kde-5/applications/kde-app.nix | 11 ++---------
 pkgs/desktops/kde-5/plasma/default.nix       | 11 ++---------
 3 files changed, 5 insertions(+), 19 deletions(-)

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

diff --git a/pkgs/desktops/kde-5/applications/default.nix b/pkgs/desktops/kde-5/applications/default.nix
index d3dc48b52823..5b2c3847adf7 100644
--- a/pkgs/desktops/kde-5/applications/default.nix
+++ b/pkgs/desktops/kde-5/applications/default.nix
@@ -21,7 +21,7 @@ let
   packages = self: with self; {
 
     kdeApp = import ./kde-app.nix {
-      inherit stdenv lib;
+      inherit kdeDerivation lib;
       inherit debug srcs;
     };
 
diff --git a/pkgs/desktops/kde-5/applications/kde-app.nix b/pkgs/desktops/kde-5/applications/kde-app.nix
index 2f1fdc1d643c..c0a947a65dad 100644
--- a/pkgs/desktops/kde-5/applications/kde-app.nix
+++ b/pkgs/desktops/kde-5/applications/kde-app.nix
@@ -1,4 +1,4 @@
-{ stdenv, lib, debug, srcs }:
+{ kdeDerivation, lib, debug, srcs }:
 
 args:
 
@@ -7,17 +7,10 @@ let
   sname = args.sname or name;
   inherit (srcs."${sname}") src version;
 in
-stdenv.mkDerivation (args // {
+kdeDerivation (args // {
   name = "${name}-${version}";
   inherit src;
 
-  outputs = args.outputs or [ "dev" "out" ];
-
-  cmakeFlags =
-    (args.cmakeFlags or [])
-    ++ [ "-DBUILD_TESTING=OFF" ]
-    ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
   meta = {
     platforms = lib.platforms.linux;
     homepage = "http://www.kde.org";
diff --git a/pkgs/desktops/kde-5/plasma/default.nix b/pkgs/desktops/kde-5/plasma/default.nix
index f6bbd5c3f51e..2299e9fbc2aa 100644
--- a/pkgs/desktops/kde-5/plasma/default.nix
+++ b/pkgs/desktops/kde-5/plasma/default.nix
@@ -13,7 +13,7 @@
 
 let
 
-  inherit (pkgs) lib stdenv symlinkJoin;
+  inherit (pkgs) lib makeSetupHook stdenv symlinkJoin;
 
   mirror = "mirror://kde";
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
@@ -24,17 +24,10 @@ let
         inherit (args) name;
         sname = args.sname or name;
         inherit (srcs."${sname}") src version;
-      in stdenv.mkDerivation (args // {
+      in kdeDerivation (args // {
         name = "${name}-${version}";
         inherit src;
 
-        outputs = args.outputs or [ "dev" "out" ];
-
-        cmakeFlags =
-          (args.cmakeFlags or [])
-          ++ [ "-DBUILD_TESTING=OFF" ]
-          ++ lib.optional debug "-DCMAKE_BUILD_TYPE=Debug";
-
         meta = {
           license = with lib.licenses; [
             lgpl21Plus lgpl3Plus bsd2 mit gpl2Plus gpl3Plus fdl12
-- 
cgit 1.4.1