From cf5ed04f49d84757b64615186379a3145120e3f9 Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@gmail.com>
Date: Tue, 29 Sep 2015 16:54:51 -0500
Subject: [PATCH] kdeApps_15_08: don't override mkDerivation

Provide a globally unique name (kdeApp) instead of using attribute paths
as namespaces and locally overloading the mkDerivation name.
---
 pkgs/applications/kde-apps-15.08/ark.nix                   | 4 ++--
 pkgs/applications/kde-apps-15.08/baloo-widgets.nix         | 4 ++--
 pkgs/applications/kde-apps-15.08/default.nix               | 7 +++----
 pkgs/applications/kde-apps-15.08/dolphin-plugins.nix       | 4 ++--
 pkgs/applications/kde-apps-15.08/dolphin.nix               | 4 ++--
 pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix          | 4 ++--
 pkgs/applications/kde-apps-15.08/gpgmepp.nix               | 4 ++--
 pkgs/applications/kde-apps-15.08/gwenview.nix              | 4 ++--
 pkgs/applications/kde-apps-15.08/kate.nix                  | 4 ++--
 .../kde-apps-15.08/kdegraphics-thumbnailers.nix            | 4 ++--
 pkgs/applications/kde-apps-15.08/kdelibs/default.nix       | 4 ++--
 pkgs/applications/kde-apps-15.08/kgpg.nix                  | 4 ++--
 pkgs/applications/kde-apps-15.08/konsole.nix               | 4 ++--
 pkgs/applications/kde-apps-15.08/ksnapshot.nix             | 4 ++--
 pkgs/applications/kde-apps-15.08/libkdcraw.nix             | 4 ++--
 pkgs/applications/kde-apps-15.08/libkexiv2.nix             | 4 ++--
 pkgs/applications/kde-apps-15.08/libkipi.nix               | 4 ++--
 pkgs/applications/kde-apps-15.08/okular.nix                | 4 ++--
 pkgs/applications/kde-apps-15.08/print-manager.nix         | 4 ++--
 19 files changed, 39 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/kde-apps-15.08/ark.nix b/pkgs/applications/kde-apps-15.08/ark.nix
index 2ce3fe7b5ce8..b0bf81e0b5bb 100644
--- a/pkgs/applications/kde-apps-15.08/ark.nix
+++ b/pkgs/applications/kde-apps-15.08/ark.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -16,7 +16,7 @@
 , libarchive
 }:
 
-mkDerivation {
+kdeApp {
   name = "ark";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
index 09695a47e4bc..d38eea96c599 100644
--- a/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
+++ b/pkgs/applications/kde-apps-15.08/baloo-widgets.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -11,7 +11,7 @@
 , kdelibs4support
 }:
 
-mkDerivation {
+kdeApp {
   name = "baloo-widgets";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/default.nix b/pkgs/applications/kde-apps-15.08/default.nix
index 286211411221..45484964ff92 100644
--- a/pkgs/applications/kde-apps-15.08/default.nix
+++ b/pkgs/applications/kde-apps-15.08/default.nix
@@ -21,13 +21,12 @@ let
   srcs = import ./srcs.nix { inherit (pkgs) fetchurl; inherit mirror; };
   mirror = "mirror://kde";
 
-  mkDerivation = args:
+  kdeApp = args:
     let
-      inherit (stdenv) mkDerivation;
       inherit (args) name;
       sname = args.sname or name;
       inherit (srcs."${sname}") src version;
-    in mkDerivation (args // {
+    in stdenv.mkDerivation (args // {
       name = "${name}-${version}";
       inherit src;
 
@@ -64,6 +63,6 @@ let
     print-manager = callPackage ./print-manager.nix {};
   };
 
-  newScope = scope: pkgs.kf513.newScope ({ inherit mkDerivation; } // scope);
+  newScope = scope: pkgs.kf513.newScope ({ inherit kdeApp; } // scope);
 
 in lib.makeScope newScope packages
diff --git a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
index 4fe6aab4639b..4eeec1c17e5b 100644
--- a/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
+++ b/pkgs/applications/kde-apps-15.08/dolphin-plugins.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -9,7 +9,7 @@
 , dolphin
 }:
 
-mkDerivation {
+kdeApp {
   name = "dolphin-plugins";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/dolphin.nix b/pkgs/applications/kde-apps-15.08/dolphin.nix
index f86a1f7ce383..1704e9ae2722 100644
--- a/pkgs/applications/kde-apps-15.08/dolphin.nix
+++ b/pkgs/applications/kde-apps-15.08/dolphin.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -26,7 +26,7 @@
 , kdelibs4support
 }:
 
-mkDerivation {
+kdeApp {
   name = "dolphin";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix b/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix
index 6714db9cb558..64f7961e7c7f 100644
--- a/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix
+++ b/pkgs/applications/kde-apps-15.08/ffmpegthumbs.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -8,7 +8,7 @@
 , ffmpeg
 }:
 
-mkDerivation {
+kdeApp {
   name = "ffmpegthumbs";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/gpgmepp.nix b/pkgs/applications/kde-apps-15.08/gpgmepp.nix
index 36acf9bd21ec..ac14573dcaa3 100644
--- a/pkgs/applications/kde-apps-15.08/gpgmepp.nix
+++ b/pkgs/applications/kde-apps-15.08/gpgmepp.nix
@@ -1,11 +1,11 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , boost
 , gpgme
 }:
 
-mkDerivation {
+kdeApp {
   name = "gpgmepp";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/gwenview.nix b/pkgs/applications/kde-apps-15.08/gwenview.nix
index ed58c8e968ad..27d20369128a 100644
--- a/pkgs/applications/kde-apps-15.08/gwenview.nix
+++ b/pkgs/applications/kde-apps-15.08/gwenview.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -13,7 +13,7 @@
 , qtx11extras
 }:
 
-mkDerivation {
+kdeApp {
   name = "gwenview";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/kate.nix b/pkgs/applications/kde-apps-15.08/kate.nix
index 30891baaf175..b24ef0b863f6 100644
--- a/pkgs/applications/kde-apps-15.08/kate.nix
+++ b/pkgs/applications/kde-apps-15.08/kate.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -26,7 +26,7 @@
 , libgit2
 }:
 
-mkDerivation {
+kdeApp {
   name = "kate";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix b/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix
index b29375b72d71..027b8248c5cd 100644
--- a/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix
+++ b/pkgs/applications/kde-apps-15.08/kdegraphics-thumbnailers.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -9,7 +9,7 @@
 , libkdcraw
 }:
 
-mkDerivation {
+kdeApp {
   name = "kdegraphics-thumbnailers";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
index 1cdebb5af54c..06788006f61e 100644
--- a/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
+++ b/pkgs/applications/kde-apps-15.08/kdelibs/default.nix
@@ -1,4 +1,4 @@
-{ mkDerivation, attica, attr, automoc4, avahi, bison, cmake
+{ kdeApp, attica, attr, automoc4, avahi, bison, cmake
 , docbook_xml_dtd_42, docbook_xsl, flex, giflib, herqq, ilmbase
 , libdbusmenu_qt, libjpeg, libxml2, libxslt, perl, phonon, pkgconfig
 , polkit_qt4, qca2, qt4, shared_desktop_ontologies, shared_mime_info
@@ -6,7 +6,7 @@
 , lib
 }:
 
-mkDerivation {
+kdeApp {
   name = "kdelibs";
 
   buildInputs = [
diff --git a/pkgs/applications/kde-apps-15.08/kgpg.nix b/pkgs/applications/kde-apps-15.08/kgpg.nix
index 95b34c3fa8bd..cf3fe20d5d7e 100644
--- a/pkgs/applications/kde-apps-15.08/kgpg.nix
+++ b/pkgs/applications/kde-apps-15.08/kgpg.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -10,7 +10,7 @@
 , kdepimlibs
 }:
 
-mkDerivation {
+kdeApp {
   name = "kgpg";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/konsole.nix b/pkgs/applications/kde-apps-15.08/konsole.nix
index 0b8c2c914f20..05cac334348e 100644
--- a/pkgs/applications/kde-apps-15.08/konsole.nix
+++ b/pkgs/applications/kde-apps-15.08/konsole.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , kdoctools
@@ -25,7 +25,7 @@
 , kxmlgui
 }:
 
-mkDerivation {
+kdeApp {
   name = "konsole";
   nativeBuildInputs = [
     extra-cmake-modules
diff --git a/pkgs/applications/kde-apps-15.08/ksnapshot.nix b/pkgs/applications/kde-apps-15.08/ksnapshot.nix
index c9ebb3859ba4..b757f4f04037 100644
--- a/pkgs/applications/kde-apps-15.08/ksnapshot.nix
+++ b/pkgs/applications/kde-apps-15.08/ksnapshot.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -9,7 +9,7 @@
 , libXfixes
 }:
 
-mkDerivation {
+kdeApp {
   name = "ksnapshot";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/libkdcraw.nix b/pkgs/applications/kde-apps-15.08/libkdcraw.nix
index e29cca4c87c2..8b19e9f90c64 100644
--- a/pkgs/applications/kde-apps-15.08/libkdcraw.nix
+++ b/pkgs/applications/kde-apps-15.08/libkdcraw.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -8,7 +8,7 @@
 , kdelibs
 }:
 
-mkDerivation {
+kdeApp {
   name = "libkdcraw";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/libkexiv2.nix b/pkgs/applications/kde-apps-15.08/libkexiv2.nix
index 6cfbab9d58b3..8ed842369556 100644
--- a/pkgs/applications/kde-apps-15.08/libkexiv2.nix
+++ b/pkgs/applications/kde-apps-15.08/libkexiv2.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -8,7 +8,7 @@
 , kdelibs
 }:
 
-mkDerivation {
+kdeApp {
   name = "libkexiv2";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/libkipi.nix b/pkgs/applications/kde-apps-15.08/libkipi.nix
index ee24fb828224..a9053b467f93 100644
--- a/pkgs/applications/kde-apps-15.08/libkipi.nix
+++ b/pkgs/applications/kde-apps-15.08/libkipi.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -7,7 +7,7 @@
 , kdelibs
 }:
 
-mkDerivation {
+kdeApp {
   name = "libkipi";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/okular.nix b/pkgs/applications/kde-apps-15.08/okular.nix
index 0de5183eb781..0691325d7a52 100644
--- a/pkgs/applications/kde-apps-15.08/okular.nix
+++ b/pkgs/applications/kde-apps-15.08/okular.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , automoc4
 , cmake
@@ -15,7 +15,7 @@
 , ebook_tools
 }:
 
-mkDerivation {
+kdeApp {
   name = "okular";
   nativeBuildInputs = [
     automoc4
diff --git a/pkgs/applications/kde-apps-15.08/print-manager.nix b/pkgs/applications/kde-apps-15.08/print-manager.nix
index ec8113a12827..909aea8e716c 100644
--- a/pkgs/applications/kde-apps-15.08/print-manager.nix
+++ b/pkgs/applications/kde-apps-15.08/print-manager.nix
@@ -1,4 +1,4 @@
-{ mkDerivation
+{ kdeApp
 , lib
 , extra-cmake-modules
 , qtdeclarative
@@ -17,7 +17,7 @@
 , kitemviews
 }:
 
-mkDerivation {
+kdeApp {
   name = "print-manager";
   nativeBuildInputs = [
     extra-cmake-modules